José Lorenzo Rodríguez c3aec39d75 Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391		2010-03-17 10:47:03 -04:30
..
config	Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2	2010-02-02 20:39:25 -05:00
console	Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2	2010-02-12 01:57:38 -02:00
libs	Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391	2010-03-17 10:47:03 -04:30
tests	Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.	2010-03-17 10:32:36 -04:30
basics.php	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
bootstrap.php	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
dispatcher.php	Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2	2010-02-02 20:39:25 -05:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Updating version numbers to 1.2.6	2010-01-29 21:54:54 -05:00