mark_story 4d6611b328 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-12-17 21:38:32 -05:00
..
App.php	Merge branch 'master' into 2.6	2014-11-07 15:13:46 -05:00
CakePlugin.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
Configure.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Object.php	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00