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
..
CakeNumber.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
CakeTime.php	Simple docblock updates to CakeTime	2014-01-08 21:38:45 -05:00
ClassRegistry.php	Replaced all is_a() calls with instanceof operator	2013-09-24 21:08:06 -04:00
Debugger.php	Add depth to log().	2014-02-16 14:35:32 -05:00
File.php	Merge branch 'master' into 2.5	2014-02-16 14:24:19 -05:00
Folder.php	Merge branch 'master' into 2.5	2014-02-11 18:17:59 +05:30
Hash.php	Merge branch 'master' into 2.5	2013-12-23 11:58:07 -05:00
Inflector.php	Update Inflector.php	2014-03-19 19:12:44 -04:00
ObjectCollection.php	cs corrections, bool to boolean and int to integer.	2013-09-17 14:44:34 +02:00
Sanitize.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
Security.php	Merge branch 'master' into 2.5	2014-02-16 14:24:19 -05:00
Set.php	fixing Set docblocks	2014-03-08 10:26:03 +00:00
String.php	Merge pull request #2506 from dereuromark/2.5-string	2013-12-21 10:31:52 -08:00
Validation.php	Merge branch 'master' into 2.5	2014-02-24 21:19:17 -05:00
Xml.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00