cakephp2-php8/lib/Cake/Core
ADmad d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
..
App.php More coding standard corrections. 2014-04-29 14:19:33 +02:00
CakePlugin.php move cast up 2014-04-08 12:22:29 +02:00
Configure.php Additional Cake references to CakePHP and docblock typo 2013-10-09 19:38:16 -04:00
Object.php microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00