mark_story 8f82156a51 Adding _mergeVars to Controller (this duplicated method will be re-factored away). ... Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.		2010-11-21 00:14:29 -05:00
..
console	Adding _mergeVars to Shell. This allows $tasks and $uses to work much	2010-11-21 00:12:07 -05:00
libs	Adding _mergeVars to Controller (this duplicated method will be re-factored away).	2010-11-21 00:14:29 -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