diff options
| author | Kevin Kubasik <kevin@kubasik.net> | 2009-09-08 17:36:43 +0000 |
|---|---|---|
| committer | Kevin Kubasik <kevin@kubasik.net> | 2009-09-08 17:36:43 +0000 |
| commit | 3de5792e13d777c2beedea11bcc308f6c9df4ff9 (patch) | |
| tree | 88a433f78b5f77ab1964162594d25f6a59e7a5d9 /docs/conf.py | |
| parent | e2d14c075a51eb1f0b832765df8723d82f0afac4 (diff) | |
| parent | bb9cc01b132dbde2461191dbb1035eaae4885051 (diff) | |
| download | django-soc2009/test-improvements.tar.gz | |
[gsoc2009-testing] Massive merge update to trunk. This is to prep for uploadarchive/soc2009/test-improvementssoc2009/test-improvements
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index 078c83a492..bdc1280c0b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,11 +41,11 @@ copyright = 'Django Software Foundation and contributors' # other places throughout the built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. release = version # The next version to be released -django_next_version = '1.1' +django_next_version = '1.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: |