cakephp2-php8/lib/Cake
mark_story cd3c54bb9d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
..
Cache Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
Config Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
Configure Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
Console Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Controller Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Core Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Error Merge branch 'master' into 2.4 2013-06-02 18:03:59 +05:30
Event Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
I18n Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Log Merge branch 'master' into 2.4 2013-06-02 18:03:59 +05:30
Model Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Network Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Routing Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Test Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
TestSuite Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
Utility Merge branch 'master' into 2.4 2013-06-10 22:12:10 -04:00
View Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
basics.php Merge branch 'master' into 2.4 2013-06-02 18:03:59 +05:30
bootstrap.php Merge pull request #1317 from lorenzo/feature/full-base-url 2013-06-05 15:12:27 -07:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.3.6 2013-06-09 22:41:41 -04:00