cakephp2-php8/lib/Cake
mark_story a3ae58da09 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
..
Cache Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
Config Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Configure Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
Console Merge branch 'master' into 2.3 2012-10-01 21:20:25 -04:00
Controller move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
Core Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
Error Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
Event Tweaked DocBlocks 2012-08-03 22:40:28 -04:00
I18n doc block correction 2012-09-28 14:51:51 +02:00
Log added missing App::uses('Hash', 'Utility'); 2012-09-13 17:20:26 +02:00
Model Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
Network Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
Routing Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
Test Merge branch 'master' into 2.3 2012-10-01 21:20:25 -04:00
TestSuite Implement missing bits for automatic sequence resetting. 2012-09-18 14:12:23 -04:00
Utility making messages() and errors() reset themselves by default 2012-10-01 14:20:53 +02:00
View Merge branch 'master' into 2.3 2012-10-01 21:20:25 -04:00
basics.php make it possible to override all of basics.php 2012-09-06 10:19:06 +02:00
bootstrap.php Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
LICENSE.txt Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
VERSION.txt Update version number to 2.2.2 2012-09-01 18:28:03 +01:00