mark_story 6d9b000aee Changing how mergeVars are handled, so the difference of app/current is used as a base. ... Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged. Thanks to hashmich for the partial patch. Fixes #1183		2010-11-20 22:34:24 -05:00
..
cases	Changing how mergeVars are handled, so the difference of app/current is used as a base.	2010-11-20 22:34:24 -05:00
fixtures	Update copyright years.	2010-10-25 07:58:22 +11:00
groups	Update copyright years.	2010-10-25 07:58:22 +11:00
lib	Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout	2010-11-10 23:03:38 -04:30
test_app	Update copyright years.	2010-10-25 07:58:22 +11:00