diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
| commit | 45a8afaabc6d09ad59bbb3c89a6cdfe8cbc3312c (patch) | |
| tree | 7ca4207099f9225b5ef74b31f48627a282e7fdf2 /system/core/CodeIgniter.php | |
| parent | cd94dd7e1d8969658810ccc4158a75d2936d0a44 (diff) | |
| parent | 934d6d9797f4dadd4e4d05b12bc4d7309fedb6c3 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r-- | system/core/CodeIgniter.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 88e730bc3..59fdba0e5 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 1.0.0 @@ -145,7 +145,7 @@ if ( ! is_php('5.4')) * The subclass prefix allows CI to know if a core class is * being extended via a library in the local application * "libraries" folder. Since CI allows config items to be - * overriden via data set in the main index.php file, + * overridden via data set in the main index.php file, * before proceeding we need to know if a subclass_prefix * override exists. If so, we will set this value now, * before any classes are loaded |