summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-26 15:34:08 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-26 15:34:08 +0100
commitcd32356021fbf83dc2cb27b9fe35472f08d10892 (patch)
treefe52eef1c11765fe3d9ddd9562e0f58c891f120b /system/core
parent1e77136c47032221ae0cdb7f6b43f56792dae224 (diff)
parent8ec82e2885d60847331e88f22ecffa71feafcb61 (diff)
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index ad87f8545..ec9c21b91 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -377,7 +377,7 @@ class CI_Output {
/**
* Set Cache
*
- * @param int $time Cache expiration time in seconds
+ * @param int $time Cache expiration time in minutes
* @return CI_Output
*/
public function cache($time)