mark_story cdede82b7e Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Core/Object.php		2013-05-07 22:22:48 -04:00
..
App.php	Add missing App::uses() to avoid fatal error	2013-03-27 17:03:24 +01:00
CakePlugin.php	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Configure.php	Fixes API parse error for link to Configure::read() in the book.	2013-03-03 20:10:09 +01:00
Object.php	Merge branch 'master' into 2.4	2013-05-07 22:22:48 -04:00