cakephp2-php8/lib/Cake
mark_story 734bb9223b Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
..
Cache Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04: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 Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
Console Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
Controller Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
Core Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
Error a / an typo fixes fot API 2014-07-30 22:11:03 +02:00
Event Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
I18n Merge branch 'master' into 2.6 2014-08-30 21:28:11 -04:00
Log console: don't use colored output if there's no TTY 2014-09-03 10:47:05 +02:00
Model Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
Network Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
Routing a / an typo fixes fot API 2014-07-30 22:11:03 +02:00
Test Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
TestSuite Update all @deprecated annotations 2014-09-02 17:03:22 +02:00
Utility Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
View Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
basics.php Merge branch 'master' into 2.6 2014-09-06 23:04:20 -04:00
bootstrap.php Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.5.4 2014-09-01 22:05:27 -04:00