summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2011-01-07 21:05:47 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2011-01-07 21:05:47 +0100
commit3ef0d283693178ceec9e9e4fb6b0d22538c3af34 (patch)
tree9d9b78bed047f7cbfc4873d2dcba50173cd3be0b /system/core/CodeIgniter.php
parent43ded2351b2703bf6fc6d9d0b2311cb08194d4bf (diff)
parent0711dc87d98ce20d3a87f7ac43d78af8fba1dca7 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system/core/CodeIgniter.php')
-rw-r--r--system/core/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 595e00f27..742903653 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2008 - 2010, EllisLab, Inc.
+ * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0