cakephp2-php8/lib/Cake
mark_story 3078a1eb52 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-01-16 22:22:26 -05:00
..
Cache Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
Config Updated the default Cake routes to include a defaultRoute true flag to allow differentiation 2014-05-29 00:55:51 -04:00
Configure Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
Console Merge branch 'master' into 2.7 2015-01-11 15:25:18 -05:00
Controller Merge branch 'master' into 2.7 2015-01-16 22:22:26 -05:00
Core Merge branch 'master' into 2.7 2015-01-11 15:25:18 -05:00
Error Remove trailing whitespace. 2014-12-14 18:05:20 -05:00
Event Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
I18n Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
Log Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
Model Merge branch 'master' into 2.7 2015-01-16 22:22:26 -05:00
Network Merge branch 'master' into 2.7 2015-01-16 22:22:26 -05:00
Routing Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
Test Merge branch 'master' into 2.7 2015-01-16 22:22:26 -05:00
TestSuite Merge branch 'master' into 2.7 2015-01-11 15:25:18 -05:00
Utility Merge branch 'master' into 2.7 2015-01-11 15:25:18 -05:00
View Merge branch 'master' into 2.7 2015-01-16 22:22:26 -05:00
basics.php Merge branch 'master' into 2.6 2014-11-07 15:13:46 -05:00
bootstrap.php Fix file_map being regenerated on every request. 2014-11-22 12:21:28 -05:00
LICENSE.txt Bump copyright year in license 2015-01-12 15:18:04 -05:00
VERSION.txt Update version number to 2.6.1 2015-01-15 21:36:35 -05:00