Commit 27cf7ec8 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Master is now pre-1.7.

parent 5caced89
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = (1, 6, 0, 'alpha', 1)
VERSION = (1, 7, 0, 'alpha', 0)

def get_version(*args, **kwargs):
    # Don't litter django/__init__.py with all the get_version stuff.
+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
version = '1.6'
version = '1.7'
# The full version, including alpha/beta/rc tags.
try:
    from django import VERSION, get_version
@@ -71,7 +71,7 @@ else:
    release = django_release()

# 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
# for a list of supported languages.