diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
| commit | 77f15dc6ba5d3308d42e8f75103c3193d3796dd2 (patch) | |
| tree | 7e1a86f8b0ff954780a28bdea6c956649cf36d57 /system/libraries/Migration.php | |
| parent | 110b467503f7a749aec685be445468c0f98b9e2a (diff) | |
| parent | 916b176594bcf175417423f33711ac0cbb4082e7 (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/libraries/Migration.php')
| -rw-r--r-- | system/libraries/Migration.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index ffa640ba6..241ce1e59 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -322,6 +322,7 @@ class CI_Migration { { return get_instance()->$var; } + } /* End of file Migration.php */ |