diff options
author | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
commit | f22ce8f368e64b1c343e06427e8dad1ab1cef2a4 (patch) | |
tree | f0552e9318a541e82c3375646fc870490d835e12 /system/core/CodeIgniter.php | |
parent | 36fb8de7bf385036f3145dd1fbd9537f6a01ac36 (diff) | |
parent | 40d1a7684444f6a8eb4cda23d8822f0b258f0c3e (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
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 0a1391d18..aca4fb23c 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -39,7 +39,7 @@ * @var string * */ - define('CI_VERSION', '2.0.2'); + define('CI_VERSION', '2.1.0-dev'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) |