Merge pull request #140 from ccnmtl/release-1.2.0

release version 1.2.0
ccnmtl · May 27, 2016 · c209e93 · c209e93
2 parents fffb3eb + 443d872
commit c209e93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,4 @@
-1.2.0
+1.2.0 (2016-05-27)
 ===================
 * Added jshint/jscs checks
 * Moved pagetree's js files from `static/pagetree/js` to

diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.15'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.15'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
 
 setup(
     name="django-pagetree",
-    version="1.1.15",
+    version="1.2.0",
     author="Anders Pearson",
     author_email="[email protected]",
     url="https://github.com/ccnmtl/django-pagetree",