mark_story 8acb75425d Merge branch 'master' into 2.5 ... Conflicts: CONTRIBUTING.md lib/Cake/Model/Datasource/DboSource.php		2014-03-21 22:55:28 -04:00
..
CakeNumberTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
CakeTimeTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
ClassRegistryTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
DebuggerTest.php	2.x needs to be compatible with PHP<5.4	2014-02-16 21:37:28 -05:00
FileTest.php	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
FolderTest.php	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
HashTest.php	more corrections in order	2014-01-10 00:33:27 +01:00
InflectorTest.php	Update InflectorTest.php	2014-03-19 19:17:52 -04:00
ObjectCollectionTest.php	Fix verification of expected invocations #2919	2014-03-01 19:06:17 +01:00
SanitizeTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
SecurityTest.php	Don't throw exception when trying to encrypt falsey value.	2013-12-15 19:28:56 +05:30
SetTest.php	more corrections in order	2014-01-10 00:33:27 +01:00
StringTest.php	more corrections in order	2014-01-10 00:33:27 +01:00
ValidationTest.php	Merge branch 'master' into 2.5	2014-02-24 21:19:17 -05:00
XmlTest.php	more corrections in order	2014-01-10 00:33:27 +01:00