From 683872bc207cec7377cbff4043d0b5832c3b3385 Mon Sep 17 00:00:00 2001
From: Jannis Gebauer <ja.geb@me.com>
Date: Sat, 24 Oct 2015 19:38:06 +0200
Subject: [PATCH] added the docker related changes from @audreyr and @jayfk

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 076a5e57..194d0177 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-10-24]
+### Changed
+- Replaced ADD with COPY in dockerfiles (@audreyr)
+- Simplified development dockerfile (@jayfk)
+- Moved the docker postgres volume on the development environment to it's own subfolder (@jayfk)
+- Renamed DJANGO_CACHE_URL to REDIS_URL (@jayfk / proposed by @pydanny)
+
 ## [2015-10-22]
 ### Removed
 - Remove unnecessary .gitkeep in static/images/ (@audreyr)