mark_story 4f237e6a93 Merge branch '2.4' making 2.4 into the master branch. ... Conflicts: lib/Cake/VERSION.txt		2013-08-30 16:02:42 -04:00
..
bake_compare/Controller	Adding files to be compared against bake generated files, fixing bake templates in the meantime.	2013-08-21 23:44:07 +02:00
Case	Merge branch '2.4' making 2.4 into the master branch.	2013-08-30 16:02:42 -04:00
Fixture	coding standards according to new sniffer rules	2013-08-08 01:03:21 +02:00
test_app	Merge branch '2.4' making 2.4 into the master branch.	2013-08-30 16:02:42 -04:00