cakephp2-php8/lib/Cake
mark_story 62186ac8da Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
..
Cache Fix: write() after clearGroup() does not actually write to file 2013-04-26 14:43:36 +07:00
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-04-24 21:59:10 -04:00
Controller Merge branch 'master' into 2.4 2013-04-28 17:00:30 -04:00
Core Merge branch 'master' into 2.4 2013-03-30 22:12:27 -04:00
Error Merge branch 'master' into 2.4 2013-03-30 22:12:27 -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 Merge branch 'master' into 2.4 2013-04-25 03:06:04 +05:30
Network Merge branch 'master' into 2.4 2013-04-27 18:39:30 +05:30
Routing fix currentRoute() when $_currentRoute is empty, return false 2013-04-26 09:09:40 +04:30
Test Merge branch 'master' into 2.4 2013-04-28 17:00:30 -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-04-25 03:06:04 +05:30
View Merge branch 'master' into 2.4 2013-04-28 17:00:30 -04:00
basics.php Merge branch 'pr-cli' into 2.4 2013-02-28 21:23:03 -05:00
bootstrap.php Make JS,CSS,IMAGES conditionally defined. 2013-04-01 21:59:41 -04:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.3.4 2013-04-28 16:30:59 -04:00