cakephp2-php8/lib/Cake
mark_story 63769ae4a6 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-02-26 12:50:35 -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-02-26 12:50:35 -05:00
Controller Merge branch 'master' into 2.7 2015-02-26 12:50:35 -05:00
Core Merge branch 'master' into 2.7 2015-01-11 15:25:18 -05:00
Error Fixed PHP 5.2 compatibility 2015-01-16 16:02:44 +01: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 Allow setting level (depth) of tree nodes on save. 2015-02-15 22:29:19 +05:30
Network Avoid reloading config file and recreating config instance. 2015-02-20 08:48:25 +05:30
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-02-26 12:50:35 -05:00
TestSuite Merge branch 'master' into 2.7 2015-02-10 23:00:43 -05:00
Utility Merge pull request #5760 from cakephp/master 2015-01-27 20:48:15 -05:00
View Merge branch 'master' into 2.7 2015-02-26 12:50:35 -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.2 2015-02-19 07:34:27 -05:00