diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/controllers | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/controllers')
| -rw-r--r-- | system/controllers/template.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/controllers/template.php b/system/controllers/template.php index 34d1a226..4267ee16 100644 --- a/system/controllers/template.php +++ b/system/controllers/template.php @@ -7,12 +7,12 @@ * To use it, declare your controller to extend this class: * `class Your_Controller extends Template_Controller` * - * $Id: template.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: template.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ abstract class Template_Controller extends Controller { |