mark_story cd3c54bb9d Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt		2013-06-10 22:12:10 -04:00
..
App.php	more whitespace coding standard corrections	2013-06-09 17:39:48 +02:00
CakePlugin.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Configure.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Object.php	Merge pull request #1317 from lorenzo/feature/full-base-url	2013-06-05 15:12:27 -07:00