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/helpers/feed.php | |
| 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/helpers/feed.php')
| -rw-r--r-- | system/helpers/feed.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/helpers/feed.php b/system/helpers/feed.php index 74bb2f6b..4aab1dcd 100644 --- a/system/helpers/feed.php +++ b/system/helpers/feed.php @@ -2,12 +2,12 @@ /** * Feed helper class. * - * $Id: feed.php 4152 2009-04-03 23:26:23Z ixmatus $ + * $Id: feed.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 */ class feed_Core { |