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
..
Cache	Merge branch '2.x' into 2.next	2016-12-13 22:48:44 -05:00
Config	Re-add the Equifax Secure Certificate Authority	2016-04-13 12:27:59 +02:00
Configure	Expand path before is_file check	2016-02-05 11:11:28 +01:00
Console	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
Controller	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
Core	Remove class extension.	2016-04-10 16:38:03 +02:00
Error	Start working on backporting security debug to 2.x	2016-10-16 11:47:26 +09:00
Event	Use more specific datatypes in PHPDoc	2016-01-28 23:10:51 +02:00
I18n	add ru-ru	2017-01-21 19:58:50 +01:00
Log	Merge pull request #8470 from ravage84/patch-4	2016-03-15 21:17:55 -04:00
Model	Rename (small|tiny)int to (small|tiny)integer	2017-03-11 21:41:22 -05:00
Network	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
Routing	fixed code style	2017-01-26 23:52:14 +01:00
Test	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
TestSuite	Fixed typos	2016-11-11 21:43:43 +01:00
Utility	Hash::filter() should not exclude 0.0	2017-03-09 21:29:44 -05:00
View	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
basics.php	Various improvments to the CakePH Plib files	2015-09-25 17:11:20 +02:00
bootstrap.php	Ensure Object is autoloaded.	2016-09-23 14:22:10 -04:00
LICENSE.txt	Bump copyright year in license	2015-01-12 15:18:04 -05:00
VERSION.txt	Update version number to 2.9.6	2017-02-28 22:27:17 -05:00