summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 45bfb7dbe1..20ca23496c 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 0, 'final', 0)
+VERSION = (1, 5, 0, 'alpha', 0)
def get_version(version=None):
"""Derives a PEP386-compliant version number from VERSION."""
diff --git a/docs/conf.py b/docs/conf.py
index 2e1a5a41e9..25979160c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,11 +50,11 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
-version = '1.4'
+version = '1.5'
# The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '1.5'
# The next version to be released
-django_next_version = '1.5'
+django_next_version = '1.6'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.