diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch) | |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /user_guide_src/source/tutorial/conclusion.rst | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c (diff) | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 (diff) | |
Fix merge conflicts
Diffstat (limited to 'user_guide_src/source/tutorial/conclusion.rst')
| -rw-r--r-- | user_guide_src/source/tutorial/conclusion.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst index a5f69b4e7..0d90cde6f 100644 --- a/user_guide_src/source/tutorial/conclusion.rst +++ b/user_guide_src/source/tutorial/conclusion.rst @@ -20,7 +20,7 @@ CodeIgniter within a few days. If you still have questions about the framework or your own CodeIgniter code, you can: -- Check out our `forums <http://ellislab.com/forums>`_ -- Visit our `IRC chatroom <https://github.com/EllisLab/CodeIgniter/wiki/IRC>`_ -- Explore the `Wiki <https://github.com/EllisLab/CodeIgniter/wiki/>`_ +- Check out our `forums <http://forum.codeigniter.com/>`_ +- Visit our `IRC chatroom <https://github.com/bcit-ci/CodeIgniter/wiki/IRC>`_ +- Explore the `Wiki <https://github.com/bcit-ci/CodeIgniter/wiki/>`_ |