mark_story 8f82156a51 Adding _mergeVars to Controller (this duplicated method will be re-factored away). ... Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.		2010-11-21 00:14:29 -05:00
..
cases	Adding _mergeVars to Controller (this duplicated method will be re-factored away).	2010-11-21 00:14:29 -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