summaryrefslogtreecommitdiff
path: root/system/controllers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-07 10:41:19 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-07 10:41:19 -0800
commitc711bf1b1fcf7840467a7a044b1f511e7b69c139 (patch)
treeee84a16b5ce4448fd41ba7ffa2cb2381b225e206 /system/controllers
parent31454d37b3ea02104925f1976609576c5f09c0c6 (diff)
parent10c05c855a1634a60048a52e8d90bc51f187ede7 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'system/controllers')
-rw-r--r--system/controllers/template.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/controllers/template.php b/system/controllers/template.php
index 4267ee16..a9b99342 100644
--- a/system/controllers/template.php
+++ b/system/controllers/template.php
@@ -7,9 +7,9 @@
* To use it, declare your controller to extend this class:
* `class Your_Controller extends Template_Controller`
*
- * $Id: template.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: template.php 4729 2009-12-29 20:35:19Z isaiah $
*
- * @package Core
+ * @package Kohana
* @author Kohana Team
* @copyright (c) 2007-2009 Kohana Team
* @license http://kohanaphp.com/license