Skip to content

Commit e2d14c0

Browse files
kkubasikkkubasik
committed
[gsoc2009-testing] Massive merge update to trunk. This is in preparation for the release of a sample app and tests
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2 parents f0a864b + cb5e5dc commit e2d14c0

File tree

87 files changed

+19926
-9566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+19926
-9566
lines changed

‎AUTHORS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
201201
Ian Holsman <http://feh.holsman.net/>
202202
Kieran Holland <http://www.kieranholland.com>
203203
Sung-Jin Hong <serialx.net@gmail.com>
204+
Leo "hylje" Honkanen <sealage@gmail.com>
204205
Richard House <Richard.House@i-logue.com>
205206
Robert Rock Howard <http://djangomojo.com/>
206207
John Huddleston <huddlej@wwu.edu>
@@ -219,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
219220
Michael Josephson <http://www.sdjournal.com/>
220221
jpellerin@gmail.com
221222
junzhang.jn@gmail.com
222-
Antti Kaihola <http://akaihola.blogspot.com/>
223+
Antti Kaihola <http://djangopeople.net/akaihola/>
223224
Bahadır Kandemir <bahadir@pardus.org.tr>
224225
Karderio <karderio@gmail.com>
225226
Nagy Károly <charlie@rendszergazda.com>
@@ -438,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
438439
viestards.lists@gmail.com
439440
George Vilches <gav@thataddress.com>
440441
Vlado <vlado@labath.org>
442+
Zachary Voase <zacharyvoase@gmail.com>
441443
Milton Waddams
442444
Chris Wagner <cw264701@ohio.edu>
443445
Rick Wagner <rwagner@physics.ucsd.edu>

‎django/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = (1, 1, 0, 'beta', 1)
1+
VERSION = (1, 2, 0, 'alpha', 0)
22

33
def get_version():
44
version = '%s.%s' % (VERSION[0], VERSION[1])
@@ -7,9 +7,8 @@ def get_version():
77
if VERSION[3:] == ('alpha', 0):
88
version = '%s pre-alpha' % version
99
else:
10-
version = '%s %s' % (version, VERSION[3])
1110
if VERSION[3] != 'final':
12-
version = '%s %s' % (version, VERSION[4])
11+
version = '%s %s %s' % (version, VERSION[3], VERSION[4])
1312
from django.utils.version import get_svn_revision
1413
svn_rev = get_svn_revision()
1514
if svn_rev != u'SVN-unknown':

‎django/conf/locale/ar/LC_MESSAGES/django.mo

1.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)