summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-02 16:17:29 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-02 16:17:29 +0200
commit9e0be2ba2179a93200d16a72c74e2ac61f9a71d4 (patch)
tree69a0b447980c260ee40d53714ad58036ada8da1a /system/core/CodeIgniter.php
parentb75faa1a03a32330e412f0bd0332fb9fa389e914 (diff)
parentee04a913dfd78d394a0e09f01655df0870369512 (diff)
Merge upstream
Diffstat (limited to 'system/core/CodeIgniter.php')
-rwxr-xr-xsystem/core/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 793c4687e..349f9f2d0 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -153,7 +153,7 @@
*
* Note: Order here is rather important as the UTF-8
* class needs to be used very early on, but it cannot
- * properly determine if UTf-8 can be supported until
+ * properly determine if UTF-8 can be supported until
* after the Config class is instantiated.
*
*/