summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-02 20:54:56 -0500
committerTim Graham <timograham@gmail.com>2015-01-02 20:54:56 -0500
commit1d5dfd01ec56fe8bb5ee6648490fd4094139f7c8 (patch)
treee61c8458e43060ee03627103a2f075ce90a8aedc
parent37ca9fe9cb6477d2f2b205f5fb99fdbaa25d6026 (diff)
[1.5.x] Bumped version for 1.5.12 release.1.5.12
-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 995e1335a2..39a91f77f3 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 5, 11, 'final', 0)
+VERSION = (1, 5, 12, 'final', 0)
def get_version(*args, **kwargs):
# Don't litter django/__init__.py with all the get_version stuff.
diff --git a/docs/conf.py b/docs/conf.py
index 2e78af4350..bb2a9e56b4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -52,7 +52,7 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
-version = '1.5.11'
+version = '1.5.12'
# The full version, including alpha/beta/rc tags.
release = version
# The next version to be released
diff --git a/setup.py b/setup.py
index cb04afbbf7..25382e71e6 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(
author_email='foundation@djangoproject.com',
description=('A high-level Python Web framework that encourages '
'rapid development and clean, pragmatic design.'),
- download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.11.tar.gz',
+ download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.12.tar.gz',
license='BSD',
packages=packages,
package_data=package_data,