mark_story 9c3089796f Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Model/Model.php		2014-08-08 23:28:06 -04:00
..
CakeNumber.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
CakeTime.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ClassRegistry.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Debugger.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
File.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
Folder.php	Merge branch 'master' into 2.6	2014-07-03 11:13:06 -04:00
Hash.php	Hash::nest() should throw an exception instead of returning an empty array	2014-07-08 13:01:02 +02:00
Inflector.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ObjectCollection.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
Sanitize.php	Fix API docblock CS errors.	2014-06-05 00:28:55 +05:30
Security.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Set.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
String.php	Merge branch 'master' into 2.6	2014-08-08 23:28:06 -04:00
Validation.php	Adjust wording.	2014-08-04 16:46:56 +02:00
Xml.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00