diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-08-07 12:38:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-08-07 12:38:16 +0200 |
| commit | 537181090448b5ad10283dd933861b5b1de6a568 (patch) | |
| tree | 2fbbe2815a356840ee840f5061fe62e96bf1feee /user_guide_src/source/changelog.rst | |
| parent | b799a0b3f09238fe46892b811025e7bf2ac81b19 (diff) | |
| parent | 1c75780da904b2a56c30c693fc3e03d2145614c2 (diff) | |
Merge pull request #2589 from vlakoff/feature/user-guide-cleanup
Fix a few more merge conflicts
Diffstat (limited to 'user_guide_src/source/changelog.rst')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 44c6f16c5..f9beff36b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -403,7 +403,7 @@ Release Date: Not Released - :doc:`Config Library <libraries/config>` changes include: - Changed ``site_url()`` method to accept an array as well. - - Removed internal method ``_assign_to_config()`` and moved its implementation in *CodeIgniter.php* instead. + - Removed internal method ``_assign_to_config()`` and moved its implementation to *CodeIgniter.php* instead. - :doc:`Security Library <libraries/security>` changes include: |