cakephp2-php8/lib/Cake
mark_story df872dde28 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
..
Cache Merge branch 'master' into 2.4 2013-05-05 14:36:46 +05:30
Config Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Configure == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Console Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
Controller Merge branch 'master' into 2.4 2013-05-05 14:36:46 +05:30
Core Merge branch 'master' into 2.4 2013-05-07 22:22:48 -04:00
Error Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
Event spelling correction. 2013-03-29 11:16:20 +01:00
I18n Merge branch 'master' into 2.4 2013-04-15 21:48:26 -04:00
Log Merge pull request #1171 from remidewitte/feature/filelog-mask2 2013-04-01 23:44:02 -07:00
Model adjust dbo source for sqlLogs variable 2013-05-06 14:32:47 +02:00
Network Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
Routing spelling corrections 2013-04-30 14:11:50 +02:00
Test Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
TestSuite Merge branch 'master' into 2.4 2013-03-26 20:31:54 -04:00
Utility Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
View Merge branch 'master' into 2.4 2013-05-10 21:58:48 -04:00
basics.php Merge branch 'pr-cli' into 2.4 2013-02-28 21:23:03 -05:00
bootstrap.php Also set mb_regex_encoding. 2013-04-30 13:00:36 -04:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.3.5 2013-05-11 02:56:56 +02:00