mark_story 0568746bfd Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/CakeSchema.php		2012-02-26 12:04:28 -05:00
..
Config	Upgrade legacy uses of App::build() types	2012-02-18 04:31:29 -08:00
Console	Merge branch '2.0' into 2.1	2012-02-26 12:04:28 -05:00
Controller	Syncing files between app directory and bake skeleton	2011-11-14 02:32:59 +05:30
Lib	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Locale/eng/LC_MESSAGES	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Model	Syncing files between app directory and bake skeleton	2011-11-14 02:32:59 +05:30
Plugin	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Test	removing 'empty' files from nonempty directories	2011-10-19 12:19:28 +07:00
tmp	fix file permissions	2011-03-16 16:06:44 +01:00
Vendor	Adding missing Vendor directory.	2011-07-28 16:31:19 -04:00
View	Moving view files from core to app	2012-02-16 01:58:11 +05:30
webroot	Merge remote-tracking branch 'origin/2.0' into 2.1	2012-01-22 15:52:54 -04:30
.htaccess	Remove extraneous space in .htaccess	2012-02-17 21:32:09 -08:00
index.php	Updating the copyright to 2011.	2011-05-30 22:46:14 -04:00