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 /user_guide_src/source/_themes | |
| 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 'user_guide_src/source/_themes')
| -rw-r--r-- | user_guide_src/source/_themes/eldocs/static/asset/css/common.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/_themes/eldocs/static/asset/css/common.css b/user_guide_src/source/_themes/eldocs/static/asset/css/common.css index b9e28aec0..66768bac6 100644 --- a/user_guide_src/source/_themes/eldocs/static/asset/css/common.css +++ b/user_guide_src/source/_themes/eldocs/static/asset/css/common.css @@ -2,7 +2,7 @@ CodeIgniter http://codeigniter.com -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 |