summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-10-22 15:48:35 +0200
committerAndrey Andreev <narf@devilix.net>2016-10-22 15:48:35 +0200
commit378627bb0e0cfb433299a6d832c18099e5c1dc9c (patch)
treeb949f10fb3e67ee0274794bca8eca16f82be4157
parent038ae9a085e1970ea26eeaf566cfae31c2802a90 (diff)
[ci skip] Prepare for 3.1.1 release
-rw-r--r--system/core/CodeIgniter.php2
-rw-r--r--user_guide_src/source/changelog.rst2
-rw-r--r--user_guide_src/source/conf.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 804c6856d..c5d26e52b 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @var string
*
*/
- const CI_VERSION = '3.1.1-dev';
+ const CI_VERSION = '3.1.1';
/*
* ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1e59d4ca2..c7bd50240 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
Version 3.1.1
=============
-Release Date: Not Released
+Release Date: Oct 22, 2016
- **Security**
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 0c4901d8f..a685c4442 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.1-dev'
+version = '3.1.1'
# The full version, including alpha/beta/rc tags.
-release = '3.1.1-dev'
+release = '3.1.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.