ADmad d9ca148499 Merge branch 'master' into 2.5 ... Conflicts: CONTRIBUTING.md lib/Cake/Model/Model.php lib/Cake/VERSION.txt		2013-10-30 02:34:09 +05:30
..
Component	Merge branch 'master' into 2.5	2013-10-30 02:34:09 +05:30
CakeErrorController.php	remove $name where not necessary to unify this in 2.x	2013-08-25 21:19:55 +02:00
Component.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
ComponentCollection.php	remove undocumented code and uncessary in_array() checks + cleanup	2013-08-08 03:56:58 +02:00
Controller.php	Add space between classname(s)	2013-10-22 22:59:50 -04:00
Scaffold.php	Removed else clauses after redirects and added return before redirect() and flash() calls	2013-08-08 21:10:41 +02:00