mark_story 4d6611b328 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-12-17 21:38:32 -05:00
..
CakeNumber.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
CakeTime.php	Merge branch 'master' into 2.6	2014-12-17 21:38:32 -05:00
ClassRegistry.php	Removed the code that was never being executed	2014-10-19 18:56:02 -04:00
Debugger.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
File.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02: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.6	2014-12-17 21:38:32 -05:00
Inflector.php	Fix incorrect pluralization of Human.	2014-12-09 21:51:42 -05: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	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
Set.php	Correct doc block return types.	2014-11-05 13:03:27 +01:00
String.php	Merge branch 'master' into 2.6	2014-08-08 23:28:06 -04:00
Validation.php	Fix PHPCS errors	2014-10-10 16:52:01 +02:00
Xml.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00