cakephp2-php8/lib/Cake
mark_story 5432f834ff Merge branch '2.5' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-04-28 20:34:29 -04:00
..
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-04-25 22:10:02 -04:00
Controller Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
Core move cast up 2014-04-08 12:22:29 +02:00
Error Merge branch 'master' into 2.5 2014-02-11 18:17:59 +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 2013-11-19 00:27:12 +05:30
Model Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
Network Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
Routing Revert changed added in #2750. 2014-04-13 20:00:34 -04:00
Test Merge branch 'master' into 2.5 2014-04-26 22:04:19 -04:00
TestSuite Fix CakeHtmlReporter output for HTML 2014-04-12 13:37:36 +02:00
Utility Remove unncessary language support. 2014-04-23 18:07:08 +02:00
View Merge branch 'master' into 2.5 2014-04-26 22:04:19 -04:00
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.5.0-RC2 2014-04-26 22:04:40 -04:00