diff options
author | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
---|---|---|
committer | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
commit | 92f10e837d132f9866626d3f2e0a633b22329ebb (patch) | |
tree | e3ade8c7dd46f90690455fb2dcc112d6d015c980 /system/language/english/number_lang.php | |
parent | 210e664abe857ddd267a7ba8713e2318d3e59a9c (diff) | |
parent | f8ae11598ba058ee02cc4f8c82dbab3420756aae (diff) |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'system/language/english/number_lang.php')
-rw-r--r-- | system/language/english/number_lang.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php index 5dfd882ed..0c19ec614 100644 --- a/system/language/english/number_lang.php +++ b/system/language/english/number_lang.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * |