cakephp2-php8/app/View
mark_story 2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
..
Elements Renaming elements and layouts 2011-05-13 02:45:36 -04:30
Emails Renaming more folders 2011-05-13 02:31:33 -04:30
Errors Renaming more folders 2011-05-13 02:31:33 -04:30
Helper Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Layouts Changed the emails folder in layouts to CamelCased. Fixes #1730. 2011-05-24 01:05:29 -04:00
Pages Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
Scaffolds Renaming more folders 2011-05-13 02:31:33 -04:30