From f32feaa9010c8cb30e69469aa458714569e14e2d Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 30 Dec 2016 17:20:55 -0500 Subject: [PATCH] Bumped version; master is now 2.0 pre-alpha. --- django/__init__.py | 2 +- docs/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/__init__.py b/django/__init__.py index 1584f27d4b..ab50cac624 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.version import get_version -VERSION = (1, 11, 0, 'alpha', 0) +VERSION = (2, 0, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/docs/conf.py b/docs/conf.py index 5cba4e50ba..1643559a1d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -81,7 +81,7 @@ copyright = 'Django Software Foundation and contributors' # built documents. # # The short X.Y version. -version = '1.11' +version = '2.0' # The full version, including alpha/beta/rc tags. try: from django import VERSION, get_version @@ -97,7 +97,7 @@ else: release = django_release() # The "development version" of Django -django_next_version = '1.11' +django_next_version = '2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.