cakephp2-php8/lib/Cake/Controller
AD7six 39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
..
Component Merge branch '2.0-class-loading' into 2.0-translations 2011-03-16 12:29:39 +01:00
AppController.php Fixing SessionComponent tests 2011-01-28 02:00:20 -04:30
CakeErrorController.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-10 23:17:54 -04:30
Component.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
ComponentCollection.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Controller.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-09 12:58:49 -04:30
PagesController.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Scaffold.php translation changes in the controller ditranslation changes in the 2011-03-12 19:59:40 +01:00