From d6de05e971e914b828243234996ec61b30c87811 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Fri, 20 Nov 2015 08:55:41 -0800 Subject: [PATCH] Updated changelog and contributors. Now including @tedmiston --- CHANGELOG.md | 9 +++++++-- CONTRIBUTORS.rst | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db7baf43..ea55cbfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,17 @@ All enhancements and patches to cookiecutter-django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2015-11-20] +### Changed +- Using python 3.5 on Heroku/Travis (@bogdal) +- Fixed typo in README (@tedmiston) + ## [2015-11-18] ### Added -- Mailhog as a replacement for Maildump +- Mailhog as a replacement for Maildump (@keybits ) ### Removed -- Maildump because it didn't support Python 3 +- Maildump because it didn't support Python 3 (@keybits) ## [2015-11-17] ### Added diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index f6c57041..f54244e0 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -65,6 +65,7 @@ Code Contributors * Théo Segonds / show0k * Cristian Vargas / @cdvv7788 * Tom Atkins / @keybits +* Taylor Edmiston / @tedmiston \* Possesses commit rights