From b76f402541a4d1eb7e2582dd804f3b4f4946b86f Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@gmail.com>
Date: Sun, 25 Oct 2015 09:29:43 -0700
Subject: [PATCH] Added version and tagging policy

---
 CHANGELOG.md | 4 +++-
 setup.py     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c19d62..e3fb8232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ All enhancements and patches to cookiecutter-django will be documented in this f
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2015-10-25]
-- Added `setup.py` so we can list it on PyPI and therefore displayed on djangopackages.com as compatible with Python 3.
+### Added
+- `setup.py` so we can list it on PyPI and therefore displayed on djangopackages.com as compatible with Python 3. (@pydanny)
+- Versioning and tagging policy (@pydanny)
 
 ## [2015-10-24]
 ### Changed
diff --git a/setup.py b/setup.py
index 2e2652aa..2d7bfee2 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,9 @@ try:
 except ImportError:
     from distutils.core import setup
 
-version = "1.0"
+# Our version ALWAYS matches the version of Django we support
+# If Django has a new release, we branch, tag, then update this setting after the tag.
+version = "1.8.5"
 
 if sys.argv[-1] == 'tag':
     os.system("git tag -a %s -m 'version %s'" % (version, version))