p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Master is now pre-1.7.

This commit is contained in:
Jacob Kaplan-Moss 2013-06-28 08:56:45 -05:00
parent 5caced89e0
commit 27cf7ec864
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/__init__.py
View File

@ -1,4 +1,4 @@
VERSION = (1, 6, 0, 'alpha', 1) VERSION = (1, 7, 0, 'alpha', 0)
def get_version(*args, **kwargs): def get_version(*args, **kwargs):
# Don't litter django/__init__.py with all the get_version stuff. # Don't litter django/__init__.py with all the get_version stuff.

4
docs/conf.py
View File

@ -55,7 +55,7 @@ copyright = 'Django Software Foundation and contributors'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.6' version = '1.7'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
try: try:
from django import VERSION, get_version from django import VERSION, get_version
@ -71,7 +71,7 @@ else:
release = django_release() release = django_release()
# The "development version" of Django # The "development version" of Django
django_next_version = '1.6' django_next_version = '1.7'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.