diff options
| author | vlakoff <vlakoff@gmail.com> | 2013-08-06 20:25:14 +0200 |
|---|---|---|
| committer | vlakoff <vlakoff@gmail.com> | 2013-08-07 09:51:13 +0200 |
| commit | 1c75780da904b2a56c30c693fc3e03d2145614c2 (patch) | |
| tree | d9aaf2756135df57af12001fc4955099c457d628 /user_guide_src/source/changelog.rst | |
| parent | c0b55d53004105bca7f7979931d46fd848e21be0 (diff) | |
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: |