Back to dev on branch

astropy · Dec 13, 2016 · 78e14f5 · 78e14f5
1 parent d9d18c9
commit 78e14f5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,18 @@
+1.2.1 (Unreleased)
+------------------
+
+
+New Features
+^^^^^^^^^^^^
+
+
+Other Changes and Additions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+Bug Fixes
+^^^^^^^^^
+
 
 1.2.0 (2016-12-13)
 ------------------

diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@
 builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME
 
 # VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
-VERSION = '1.2.0'
+VERSION = '1.2.1.dev'
 
 # Indicates if this version is a release version
 RELEASE = 'dev' not in VERSION