summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-21 06:17:14 -0400
committerTim Graham <timograham@gmail.com>2014-03-21 06:17:14 -0400
commit2f37ad88b14d50f38b31adaa6c904e38c573dfc4 (patch)
tree82971b2d34234817bd63966d11a65ee3e7154667
parent4d0c5f61427a8e67552ee2d777fffbadc7aff3b2 (diff)
Bumped version to reflect master is now pre-1.8.
-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 1b7c96bffd..7bb46b6569 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 7, 0, 'alpha', 2)
+VERSION = (1, 8, 0, 'alpha', 0)
def get_version(*args, **kwargs):
diff --git a/docs/conf.py b/docs/conf.py
index f10354f244..30e57aee15 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
-version = '1.7'
+version = '1.8'
# The full version, including alpha/beta/rc tags.
try:
from django import VERSION, get_version
@@ -82,7 +82,7 @@ else:
release = django_release()
# The "development version" of Django
-django_next_version = '1.7'
+django_next_version = '1.8'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.