cakephp2-php8/lib/Cake/Test/Case/Controller
Jose Lorenzo Rodriguez d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
..
Component Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
ComponentCollectionTest.php Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
ComponentTest.php Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
ControllerMergeVarsTest.php Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
ControllerTest.php Fix Controller::beforeRedirect() and array return. 2012-06-24 12:03:31 -04:00
PagesControllerTest.php Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
ScaffoldTest.php Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00