diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-29 16:50:09 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-29 16:50:09 +0200 |
| commit | 70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (patch) | |
| tree | a0970957a17eeaa0e31e501d5ce537023b846110 /system/core | |
| parent | 4c907236af3b6dc11a7b4989ece1c84a26483c46 (diff) | |
| parent | 4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core')
| -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) |