diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
| commit | 0f2cb79b976086cb73140c25f4c568e865177426 (patch) | |
| tree | e67e0247e540ea8be6c7b37f627c4b13c0f0a586 /readme.rst | |
| parent | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (diff) | |
| parent | e30e400581a663045486985d0e75bc77631a2ef2 (diff) | |
Merged develop and fixed conflicts.
Diffstat (limited to 'readme.rst')
| -rw-r--r-- | readme.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readme.rst b/readme.rst index 26e04ceac..2369a8ddb 100644 --- a/readme.rst +++ b/readme.rst @@ -23,7 +23,7 @@ Changelog and New Features ************************** You can find a list of all changes for each release in the `user -guide change log <https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html>`_. +guide change log <https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide_src/source/changelog.rst>`_. ******************* Server Requirements @@ -193,4 +193,4 @@ Acknowledgement *************** The EllisLab team and The Reactor Engineers would like to thank all the -contributors to the CodeIgniter project and you, the CodeIgniter user.
\ No newline at end of file +contributors to the CodeIgniter project and you, the CodeIgniter user. |