cakephp2-php8/lib/Cake/Controller
mark_story 3fc627c5f8 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
..
Component Merge branch 'master' into 2.4 2013-03-30 22:12:27 -04:00
CakeErrorController.php Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Component.php Tidy up doc blocks. 2013-02-26 21:43:53 -05:00
ComponentCollection.php Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Controller.php Tidy up doc blocks. 2013-02-26 21:43:53 -05:00
Scaffold.php == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00