summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 685297b64a..6fcfaf8385 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 2, 5, 'final', 0)
+VERSION = (1, 2, 6, 'final', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
diff --git a/docs/conf.py b/docs/conf.py
index ac6aed1fb9..c16047bd0e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -52,7 +52,7 @@ copyright = 'Django Software Foundation and contributors'
# The short X.Y version.
version = '1.2'
# The full version, including alpha/beta/rc tags.
-release = version
+release = '1.2.6'
# The next version to be released
django_next_version = '1.3'
diff --git a/setup.py b/setup.py
index aa213cd43e..cd61873dbe 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ setup(
author = 'Django Software Foundation',
author_email = 'foundation@djangoproject.com',
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
- download_url = 'http://media.djangoproject.com/releases/1.2/Django-1.2.5.tar.gz',
+ download_url = 'http://media.djangoproject.com/releases/1.2/Django-1.2.6.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,