cakephp2-php8/cake/libs/view
mark_story e149c411fb Merge branch '1.3' into merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/shells/tasks/template.php
	cake/dispatcher.php
	cake/libs/controller/component.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
..
elements Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
errors Removing extra param in internacionalization. 2011-01-19 10:08:35 -02:00
helpers Merge branch '1.3' into merger 2011-02-05 12:20:09 -05:00
layouts Removing extra param in internacionalization. 2011-01-19 10:08:35 -02:00
pages Updating version numbers for 1.3.7 2011-01-19 15:10:53 -05:00
scaffolds Removing extra param in internacionalization. 2011-01-19 10:08:35 -02:00
helper.php Moving loadConfig to Html helper. 2011-01-23 16:21:17 -02:00
helper_collection.php Fixing typo. 2011-02-05 05:54:38 -05:00
media.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
scaffold.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
theme.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
view.php Assigning the helper object in view class, avoiding to use __get magic for each call. 2011-01-23 20:51:56 -02:00