summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-09-21 09:52:54 -0400
committerTim Graham <timograham@gmail.com>2017-09-22 12:51:17 -0400
commit92fad87958763a649c698cf28b99ec2c4a2fd109 (patch)
tree0b1b541fa9f4ac1625cb6b00f3a4c05b2178fe97
parent559040f3d3552870cf010b5d10779ab30913d854 (diff)
Bumped version; master is now 2.1 pre-alpha.
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py
index ee35e129a1..97c7fa2092 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,6 +1,6 @@
from django.utils.version import get_version
-VERSION = (2, 0, 0, 'alpha', 0)
+VERSION = (2, 1, 0, 'alpha', 0)
__version__ = get_version(VERSION)
diff --git a/docs/conf.py b/docs/conf.py
index 2344e71dcf..2bd56466cb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -79,7 +79,7 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
-version = '2.0'
+version = '2.1'
# The full version, including alpha/beta/rc tags.
try:
from django import VERSION, get_version
@@ -95,7 +95,7 @@ else:
release = django_release()
# The "development version" of Django
-django_next_version = '2.0'
+django_next_version = '2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.