summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorDarren Hill <dchill42@gmail.com>2011-08-31 20:13:02 +0200
committerDarren Hill <dchill42@gmail.com>2011-08-31 20:13:02 +0200
commit054be5beba0b80b861ac170513bd94d73a478663 (patch)
treed4f55e5133f6cb787b0f7f2bab68d16e513eee1c /application
parent4d1cd4c56697bc53b5a9899089ab4c978c66e1da (diff)
parentd369077ac6cae25fa51c9840a466e54333300d0a (diff)
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'application')
-rw-r--r--application/config/config.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 880393c29..a6d10d8dc 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -79,6 +79,8 @@ $config['language'] = 'english';
| This determines which character set is used by default in various methods
| that require a character set to be provided.
|
+| See http://php.net/htmlspecialchars for a list of supported charsets.
+|
*/
$config['charset'] = 'UTF-8';