diff options
| author | Andrew <browner12@gmail.com> | 2014-02-17 19:24:00 +0100 |
|---|---|---|
| committer | Andrew <browner12@gmail.com> | 2014-02-17 19:24:00 +0100 |
| commit | 63cb46b94c4dda33e036643fbca3d94e0ba079f0 (patch) | |
| tree | a8bc36fa23e3a7de491223c896d9aadaf4e8c408 /system/core/Controller.php | |
| parent | b6d8b962e44202a74c9b9321a4a53f61a753fccf (diff) | |
| parent | ffe8aded4d2210759fce3427ed04893e6c655006 (diff) | |
Merge branch 'develop' into patch-1
Diffstat (limited to 'system/core/Controller.php')
| -rw-r--r-- | system/core/Controller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index 3fcadcadf..8db222a98 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, 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 |