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
..
config	Merge branch '1.3' into merger	2010-11-16 21:48:13 -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
tests	Adding _mergeVars to Controller (this duplicated method will be re-factored away).	2010-11-21 00:14:29 -05:00
basics.php	Small optimizations in env() and Helper::_parseAttributes().	2010-11-16 22:24:54 -05:00
bootstrap.php	Pulling App out into its own file. Trying to stick with one class per file conventions.	2010-11-14 13:02:30 -05:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Updating version numbers for 1.3.6	2010-11-13 20:01:20 -05:00