cakephp2-php8/lib/Cake
mark_story 8acb75425d Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
2014-03-21 22:55:28 -04:00
..
Cache Merge branch 'master' into 2.5 2014-02-18 22:19:12 -05: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-02-16 14:24:19 -05:00
Controller Remove setting of Controller::$ext by RequestHandler. 2014-03-16 20:09:08 +05:30
Core Fix ApiGen errors 2014-02-07 18:29:54 -02:00
Error Merge branch 'master' into 2.5 2014-02-11 18:17:59 +05:30
Event fix issues #2897 2014-02-26 08:02:21 +03:30
I18n Moved Limburgish to correct the order 2014-03-02 14:30:26 +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-03-21 22:55:28 -04:00
Network Merge branch 'master' into 2.5 2014-03-18 22:12:14 -04:00
Routing Merge branch 'master' into 2.5 2014-03-11 21:02:27 -04:00
Test Merge branch 'master' into 2.5 2014-03-21 22:55:28 -04:00
TestSuite Merge branch 'master' into 2.5 2014-03-21 22:55:28 -04:00
Utility Merge branch 'master' into 2.5 2014-03-21 22:55:28 -04:00
View Merge branch 'master' into 2.5 2014-03-18 22:12:14 -04:00
basics.php Fix: Regression with format specifiers in i18n methods 2014-03-07 09:22:56 +07: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.6 2014-03-01 21:22:04 -05:00