chinpei215 31a1837c1d Merge branch '2.x' into 2.next ... Conflicts: lib/Cake/Test/Case/View/Helper/FlashHelperTest.php lib/Cake/VERSION.txt lib/Cake/View/Helper/FlashHelper.php		2017-03-25 17:12:28 +09:00
..
Component	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
ComponentCollectionTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
ComponentTest.php	fixed configuration of 'enabled' setting in components inside a	2016-10-28 22:14:20 +02:00
ControllerMergeVarsTest.php	Refactor Object to CakeObject for future PHP7 comp.	2016-04-08 14:33:26 +02:00
ControllerTest.php	Refactor Object to CakeObject for future PHP7 comp.	2016-04-08 14:33:26 +02:00
PagesControllerTest.php	Fix directory traversal of .ctp files	2016-11-27 18:14:44 +09:00
ScaffoldTest.php	Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 05:49:23 +09:00