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
..
config	Updating version numbers for 1.3.6	2010-11-13 20:01:20 -05:00
console	Applying updates to skel/core.php. Fixes #1255	2010-11-02 21:43:33 -04:00
libs	Changing how mergeVars are handled, so the difference of app/current is used as a base.	2010-11-20 22:34:24 -05:00
tests	Changing how mergeVars are handled, so the difference of app/current is used as a base.	2010-11-20 22:34:24 -05:00
basics.php	Removing closing PHP tags.	2010-05-11 08:07:49 +10:00
bootstrap.php	Removing closing PHP tags.	2010-05-11 08:07:49 +10:00
dispatcher.php	Reverting change from [16387f1961]. Using	2010-11-05 22:31:41 -04:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Updating version numbers for 1.3.6	2010-11-13 20:01:20 -05:00