cakephp2-php8/lib/Cake/Controller
ADmad d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
..
Component Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
CakeErrorController.php Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
Component.php a few more corrections 2014-04-08 01:49:33 +02:00
ComponentCollection.php remove undocumented code and uncessary in_array() checks + cleanup 2013-08-08 03:56:58 +02:00
Controller.php correct deprecation notices 2014-04-04 19:18:02 +02:00
Scaffold.php Deprecated scaffold and scaffoldview. 2013-12-20 14:16:44 -05:00