diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
| commit | 66a8940823b8ce9cd9e0bfe5d4263008a437a422 (patch) | |
| tree | 0d02a82cce7adfbfeee51e2a4a7257c74f906551 /user_guide_src/source/installation/downloads.rst | |
| parent | 175b17c4b74d03a7578440d92a3ac9d80924ef78 (diff) | |
| parent | ab3c383fb3535e55253271f210870cd9361d94c9 (diff) | |
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, 3 insertions, 1 deletions
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index d3081719f..c5ce2e836 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,8 +2,10 @@ Downloading CodeIgniter ####################### +<<<<<<< HEAD - `CodeIgniter v3.1.0-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_ -- `CodeIgniter v3.0.3-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `CodeIgniter v3.0.4-dev <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_ +- `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>`_ - `CodeIgniter v3.0.0 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.0>`_ |