cakephp2-php8/lib/Cake
ADmad d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
..
Cache microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
Config Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
Configure Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
Console Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Controller Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Core Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Error Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Event Make dispatch return CakeEvent - resolves #2819 2014-04-06 21:17:51 +02:00
I18n Introduced I18n category constants (#1894) 2014-03-23 17:00:17 +01:00
Log Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Model Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Network Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Routing Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
Test Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
TestSuite Fix CakeHtmlReporter output for HTML 2014-04-12 13:37:36 +02:00
Utility Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
View Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30
basics.php Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
bootstrap.php Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.4.9 2014-04-29 21:52:10 -04:00