diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-01-13 01:15:29 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-01-13 01:15:29 +0100 |
| commit | 0bf5b26f99d940ae7ebd3780b1d60e37f8045ea3 (patch) | |
| tree | f862195175e377583d4f8cd1f6646ad0ba935a2d /user_guide_src/source/installation/downloads.rst | |
| parent | 4e44a4d9fcf6590fddbba93545b8bde893910c22 (diff) | |
| parent | 4307bff0a4ae884d57cc0c0fa8f54de6c05000e7 (diff) | |
[ci skip] Merge branch '3.0-stable' into develop
Diffstat (limited to 'user_guide_src/source/installation/downloads.rst')
| -rw-r--r-- | user_guide_src/source/installation/downloads.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index c5ce2e836..c7211c1de 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,9 +2,9 @@ Downloading CodeIgniter ####################### -<<<<<<< HEAD - `CodeIgniter v3.1.0-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_ -- `CodeIgniter v3.0.4-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `CodeIgniter v3.0.5-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `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>`_ - `CodeIgniter v3.0.1 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.1>`_ |