summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-26 23:31:44 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-26 23:31:44 +0200
commit84c3bf369497e33b600deaea20297e89e265047a (patch)
tree64f49bddb2b065f048664aed46ee7766d876fa9f /system/core/CodeIgniter.php
parentbe72bd2d1cdba222bbbce547e1603de1e4ec7961 (diff)
parentb183ece10dcde599c04af412f0f5c1c776ed29d8 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/CodeIgniter.php')
-rwxr-xr-xsystem/core/CodeIgniter.php2
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)