Commit graph

4 commits

Author SHA1 Message Date
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
ADmad
233a63366f Syncing files between app directory and bake skeleton 2011-11-14 02:32:59 +05:30
ADmad
87f12de1ab Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper. 2011-11-14 02:11:18 +05:30
Jose Lorenzo Rodriguez
6737380deb Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30