summaryrefslogtreecommitdiffstats
path: root/system/core/Model.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-06-06 23:08:59 +0200
committerFlorian Pritz <bluewind@xinu.at>2014-06-06 23:08:59 +0200
commit77f15dc6ba5d3308d42e8f75103c3193d3796dd2 (patch)
tree7e1a86f8b0ff954780a28bdea6c956649cf36d57 /system/core/Model.php
parent110b467503f7a749aec685be445468c0f98b9e2a (diff)
parent916b176594bcf175417423f33711ac0cbb4082e7 (diff)
Merge remote-tracking branch 'remotes/upstream/2.2-stable' into working
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: system/libraries/Session.php user_guide/
Diffstat (limited to 'system/core/Model.php')
-rw-r--r--system/core/Model.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Model.php b/system/core/Model.php
index e15ffbebc..1f142509e 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
+ * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0