diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-08-30 14:19:29 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-08-30 14:19:29 +0200 |
| commit | 7d02c59da55224bb9ce9aaea470ba237a4100a34 (patch) | |
| tree | c84fd127cf7a4739988ade0b398cfaa7f75da2fe /system/core | |
| parent | 6ac5e9af6770b4f9cb1349aa562edd4b8e84ce32 (diff) | |
| parent | 37df6fa88ec63bffa5545bdc3b3c7c3801c9b635 (diff) | |
Merge tag '2.2.0' into working
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/core')
| -rw-r--r-- | 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 ad2cadd96..34078174a 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,7 +33,7 @@ * @var string * */ - define('CI_VERSION', '2.1.4'); + define('CI_VERSION', '2.2.0'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) |