diff options
author | Timothy Warren <tim@timshomepage.net> | 2011-10-21 10:45:48 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2011-10-21 10:45:48 +0200 |
commit | 0f6659ddfce7214f74aab20ab24a9a88c93059f5 (patch) | |
tree | 4762feb2d00550036a9d4ce1383cb2986d23b321 /user_guide_src/source/conf.py | |
parent | d1a5ba2678c88e507d05b6d0235ee91b4b4db311 (diff) | |
parent | f4a4bd8fac188ebc9cda822ffc811c218fd92b45 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source/conf.py')
-rw-r--r-- | user_guide_src/source/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index bd5e65297..bb10d06e4 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2011, EllisLab, Inc.' # built documents. # # The short X.Y version. -version = '2.1' +version = '3.0' # The full version, including alpha/beta/rc tags. -release = '2.1.0' +release = '3.0-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |