mark_story 66e6ec763e Merge branch 'dispatcher-request' into 2.0 ... Conflicts: cake/libs/configure.php cake/tests/cases/libs/all_routing.test.php cake/tests/cases/libs/controller/controller.test.php		2010-11-15 22:42:54 -05:00
..
cases	Merge branch 'dispatcher-request' into 2.0	2010-11-15 22:42:54 -05:00
fixtures	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
lib	Removing =& operators for construction of objects.	2010-11-12 23:05:44 -05:00
test_app	Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.	2010-11-07 13:23:45 -05:00