Merge pull request #134 from ccnmtl/release-1.1.15

release 1.1.15
ccnmtl · May 25, 2016 · 486a52e · 486a52e
2 parents 4ffd151 + 3ddf454
commit 486a52e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.15 (2016-05-25)
+===================
+* Updated jQuery to 1.12.3
+* Updated jQuery UI to 1.11.4
 * label/css_extra required field bugfix on add pageblock form
 
 1.1.14 (2016-03-31)

diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.7'
+version = '1.1.15'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.7'
+release = '1.1.15'
 
 # 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.14",
+    version="1.1.15",
     author="Anders Pearson",
     author_email="anders@columbia.edu",
     url="https://github.com/ccnmtl/django-pagetree",