Commit 89df5180 authored by Marc Tamlyn's avatar Marc Tamlyn
Browse files

Merge branch 'stable/1.7.X' 

We fork at beta. This branch will be recreated when the first beta is created.
It has been merged in to maintain the version number bump and tag.
parents 0b6b1ee2 8be9a250

django/__init__.py

+1 −1
Original line number Diff line number Diff line 
VERSION = (1, 7, 0, 'alpha', 0)

VERSION = (1, 7, 0, 'alpha', 1)





def get_version(*args, **kwargs):