cakephp2-php8/lib/Cake
mark_story c24bec679b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
..
Cache Merge branch '2.3' into type-checks 2012-10-01 02:08:00 +01:00
Config Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Configure allow ini files to have separators between sections for better readability 2012-10-18 17:20:15 +02:00
Console cleanup 2012-10-27 00:26:54 +02:00
Controller Merge branch 'master' into 2.3 2012-10-27 21:13:53 -04:00
Core Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
Error cleanup 2012-10-27 00:26:54 +02:00
Event Tweaked DocBlocks 2012-08-03 22:40:28 -04:00
I18n Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
Log Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
Model Merge branch 'master' into 2.3 2012-10-27 21:13:53 -04:00
Network Merge branch 'master' into 2.3 2012-10-27 21:13:53 -04:00
Routing Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
Test Merge branch 'master' into 2.3 2012-10-27 21:13:53 -04:00
TestSuite Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
Utility coding standards regarding whitespaces 2012-10-27 00:46:12 +02:00
View Merge branch 'master' into 2.3 2012-10-27 21:13:53 -04:00
basics.php Merge branch '2.3' into type-checks 2012-10-24 19:03:44 +01:00
bootstrap.php coding standards regarding whitespaces 2012-10-27 00:46:12 +02:00
LICENSE.txt Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
VERSION.txt Update version number to 2.2.3 2012-10-08 20:15:03 -04:00