diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-03 10:01:50 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-03 10:01:50 +0100 |
| commit | 166396ed9e03f78444970372983d50fd34a5ca96 (patch) | |
| tree | f209bdbc89c0e4310ebf772299e0bd7e7ecef68d /system/core/CodeIgniter.php | |
| parent | b195637240bbbc7c3dc7ee0585f0e4cd39cb9d81 (diff) | |
| parent | 29e1122c19c532b7299598fb7ddfb7f15264ad78 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-xmlrpc
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rwxr-xr-x | system/core/CodeIgniter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 97527e5ca..5152073d5 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 |