diff options
author | Andrey Andreev <narf@devilix.net> | 2016-03-21 17:32:19 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-03-21 17:32:19 +0100 |
commit | b4d719dc7fb3b010b53c09e7e82f979abf731ff9 (patch) | |
tree | 34e3d8213830f8d6362fbb868718806ad100dceb /user_guide_src/source/installation/downloads.rst | |
parent | 99e8dc396f6f79980623daaf9265f4933b897ff6 (diff) | |
parent | eb373a1abb348515001123ecbaca5e5384e69d19 (diff) |
Merge branch '3.0-stable' into develop
Resolved conflicts:
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'user_guide_src/source/installation/downloads.rst')
-rw-r--r-- | user_guide_src/source/installation/downloads.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 8c2a56c5b..29f1a6d87 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -3,7 +3,8 @@ Downloading CodeIgniter ####################### - `CodeIgniter v3.1.0-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_ -- `CodeIgniter v3.0.6-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `CodeIgniter v3.0.7-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `CodeIgniter v3.0.6 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.6>`_ - `CodeIgniter v3.0.5 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.5>`_ - `CodeIgniter v3.0.4 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.4>`_ - `CodeIgniter v3.0.3 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.3>`_ |