diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-03-07 16:52:40 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-03-07 16:52:40 +0100 |
| commit | 3b74f57cfa6c43eab4c7cce440a454d095974a45 (patch) | |
| tree | 9b09cf29cd2d94e34bd70abc52eaf9950f7e05df /system | |
| parent | 76c4f279210d5eaed71a21e13caa7e01f4947ca9 (diff) | |
| parent | 1c6a3f4356856899f012c6dc1ae81a21c35016e0 (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system')
| -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 84f224123..d9ac7efe3 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -359,7 +359,7 @@ if ( ! is_php('5.4')) * * Returns current CI instance object * - * @return object + * @return CI_Controller */ function &get_instance() { |