diff options
author | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
commit | a190d78a0238a0a6abd463823321bef15713e312 (patch) | |
tree | a4e49327f8e6ca1660018cebf3b06131ae3e5faf /user_guide_src/source/installation/downloads.rst | |
parent | 3b74f57cfa6c43eab4c7cce440a454d095974a45 (diff) | |
parent | 4f9b20ae507dda7379d392386fb7ce5702626a91 (diff) |
Merge branch '3.0-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
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 c7211c1de..8c2a56c5b 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.5-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `CodeIgniter v3.0.6-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `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>`_ - `CodeIgniter v3.0.2 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.2>`_ |