cakephp2-php8/lib/Cake
Jose Lorenzo Rodriguez 343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
..
Cache Merge branch 'master' into 2.5 2014-03-30 21:24:55 -04: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-06 21:50:41 +02:00
Controller Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
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 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 Insert manual joins *after* generated joins. 2014-03-23 21:09:08 -04:00
Network Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
Routing Remove $reponse param of Dispatcher::_invoke(). 2014-03-30 19:29:07 +05:30
Test Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
TestSuite Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
Utility Merge branch 'master' into 2.5 2014-04-06 21:50:41 +02:00
View Merge branch 'master' into 2.5 2014-03-23 11:01:13 -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.4.7 2014-04-04 22:25:48 -04:00