mark_story 66e6ec763e Merge branch 'dispatcher-request' into 2.0 ... Conflicts: cake/libs/configure.php cake/tests/cases/libs/all_routing.test.php cake/tests/cases/libs/controller/controller.test.php		2010-11-15 22:42:54 -05:00
..
console	Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.	2010-11-12 23:57:55 -05:00
libs	Merge branch 'dispatcher-request' into 2.0	2010-11-15 22:42:54 -05:00
basics.test.php	Unwinding several ifs used in debug(). Creating simple string templates instead. Fixes #818	2010-10-24 18:23:27 -04:00