diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-06-12 15:57:07 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2018-06-12 15:57:07 +0200 |
| commit | b3f7aae1079e8e484437bc67f4c126f34e7903d8 (patch) | |
| tree | 8d5961bc6260fec1769f852f2383656e15e5b77a /system/libraries/Session/Session.php | |
| parent | 1fd1494c709ced0b20252976c65145e21be046ee (diff) | |
| parent | 44f53fb063eed55c79d31d0d19eef7ba973b6054 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
system/libraries/Email.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'system/libraries/Session/Session.php')
| -rw-r--r-- | system/libraries/Session/Session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index 26bc4f486..04855f65a 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -585,7 +585,7 @@ class CI_Session { // ------------------------------------------------------------------------ /** - * Unmark flash + * Unmark temp * * @param mixed $key Session data key(s) * @return void |