cakephp2-php8/lib/Cake
mark_story 9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
..
Cache Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
Config Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Configure Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
Console Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Controller Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Core Move where set is loaded. 2012-04-10 21:25:04 -04:00
Error Merge branch '2.1' into 2.2 2012-04-05 23:27:21 +02:00
Event Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
I18n Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Log Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Model Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Network Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Routing Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Test Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
TestSuite Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
Utility Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
View Merge branch '2.2-hash' into 2.2 2012-04-10 21:32:37 -04:00
basics.php substr() optimizations 2012-03-28 13:07:26 -07:00
bootstrap.php Move where set is loaded. 2012-04-10 21:25:04 -04:00
LICENSE.txt Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
VERSION.txt Update version number to 2.1.1 2012-03-25 21:00:26 -04:30