José Lorenzo Rodríguez 1f1e0f4ff7 Merge commit 'origin/1.3' into 1.3-form		2010-02-27 23:23:43 -04:30
..
config	Merge remote branch 'origin/1.2' into 1.2-merger	2010-02-20 01:32:04 -05:00
console	Fixing baking views for models in plugins. Making sure that the temporary controller object gets its plugin property set so the correct models are loaded and used. Fixes #381	2010-02-27 20:28:04 -05:00
libs	Merge commit 'origin/1.3' into 1.3-form	2010-02-27 23:23:43 -04:30
tests	Merge commit 'origin/1.3' into 1.3-form	2010-02-27 23:23:43 -04:30
basics.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
bootstrap.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
dispatcher.php	Merge remote branch 'origin/1.2' into 1.2-merger	2010-02-20 01:32:04 -05:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Fix newline in VERSION.txt	2010-02-24 07:58:33 +11:00