Commit a71ff762 authored by James Bennett's avatar James Bennett
Browse files

[1.6.x] Bump version numbers for 1.6 release.

parent 84b9ab7c

django/__init__.py

+1 −1
Original line number Diff line number Diff line 
VERSION = (1, 6, 0, 'rc', 1)

VERSION = (1, 6, 0, 'final', 0)



def get_version(*args, **kwargs):

    # Don't litter django/__init__.py with all the get_version stuff.

docs/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/releases/1.6.txt

+5 −3
Original line number Diff line number Diff line 
============================================

Django 1.6 release notes - UNDER DEVELOPMENT

============================================

=========================

 Django 1.6 release notes

=========================



.. note::
@@ -20,6 +20,8 @@ Django 1.6 release notes - UNDER DEVELOPMENT 


    -- The Django Developers



*November 6, 2013*



Welcome to Django 1.6!



These release notes cover the `new features`_, as well as some `backwards