summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-12-27 19:36:22 -0500
committerTim Graham <timograham@gmail.com>2019-01-17 10:50:24 -0500
commitffe53096a9dc4d4d0f28f9bc9082d0ad2b6d5873 (patch)
tree9cb6b681d0453b2987cbd29373b80a86e217bb60
parenta0c059995a2f89c8059552a6a99b540ed64d9e82 (diff)
Bumped version; master is now 3.0 pre-alpha.
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 4ebf3e779a..a9dad2e279 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,6 +1,6 @@
from django.utils.version import get_version
-VERSION = (2, 2, 0, 'alpha', 0)
+VERSION = (3, 0, 0, 'alpha', 0)
__version__ = get_version(VERSION)
diff --git a/docs/conf.py b/docs/conf.py
index c720273531..1da94f01b6 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 = '2.2'
+version = '3.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 = '2.2'
+django_next_version = '3.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.