mark_story 6664acba79 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/VERSION.txt		2012-09-05 20:15:36 -04:00
..
CakeNumber.php	Fix formatting with locales using , as decimal separator	2012-06-18 23:13:09 -04:00
CakeTime.php	Code standards fixes, unneeded break statements	2012-09-04 11:30:52 -07:00
ClassRegistry.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Debugger.php	Merge branch 'master' into 2.3	2012-09-05 20:15:36 -04:00
File.php	rtim files	2012-07-18 03:55:29 +02:00
Folder.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Hash.php	Optimization for Hash method	2012-06-24 12:47:30 -04:00
Inflector.php	Fixing coding conventions	2012-05-19 16:08:40 +01:00
ObjectCollection.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Sanitize.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Security.php	Merge branch 'master' into 2.3	2012-09-05 20:15:36 -04:00
Set.php	Merge branch '2.1' into 2.2	2012-05-30 21:20:56 -04:00
String.php	legacy support with test cases	2012-08-17 13:57:47 +02:00
Validation.php	Refactor Validator::decimal() to be more flexible with decimal	2012-08-27 23:25:17 -03:00
Xml.php	Fix XML decoding attack via external entities.	2012-07-14 11:53:37 -04:00