summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-31 21:18:48 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-31 21:18:48 +0200
commit47a62548cfdcd5fb6588a2caa92d3b55ac05de6f (patch)
treeb1952e3cbfde4e1baf605526a573d112a4bc819d /application/config
parentbbf2853c351425ea75f43599c3b229a8c323448c (diff)
parentef26dfcb705521be0ad85b00fdb735299bdd02d2 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config')
-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';