diff options
author | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:14:13 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:14:13 +0200 |
commit | 8ec72f2ee46984ed0ca9abc5a01742e56fa0c300 (patch) | |
tree | 43bd6d55f6eea11239a757304427c7c5f0cab63e /user_guide_src/source/conf.py | |
parent | b6995a6a1bdfb2275b3befb89d51da0a1769771e (diff) | |
parent | 014be1e8726ebce6dd19284ae3deaee866d6b0e5 (diff) |
Merge branch 'release/3.1.2' into 3.1-stable
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 17771fa9e..2f44e0cbe 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2016, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.2-dev' +version = '3.1.2' # The full version, including alpha/beta/rc tags. -release = '3.1.2-dev' +release = '3.1.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |