mark_story ac9a212d44 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/Utility/String.php		2015-01-11 15:25:18 -05:00
..
CakeNumber.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
CakeText.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
CakeTime.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
ClassRegistry.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
Debugger.php	App::uses and usage replacements for String => CakeText.	2015-01-05 01:00:57 +01:00
File.php	Backport changes from #5635 to 2.x	2015-01-11 15:20:34 -05:00
Folder.php	Simplification of return types. No need to return more mixed than necessary.	2014-11-08 20:07:47 +01:00
Hash.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
Inflector.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
ObjectCollection.php	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00
Sanitize.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
Security.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
Set.php	App::uses and usage replacements for String => CakeText.	2015-01-05 01:00:57 +01:00
String.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
Validation.php	Fix PHPCS errors	2014-10-10 16:52:01 +02:00
Xml.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00