Mark Story 98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 ... Conflicts: cake/libs/folder.php		2010-01-25 11:18:44 -05:00
..
console	Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3	2010-01-25 11:18:44 -05:00
libs	Merge branch '1.3-cache' into 1.3	2010-01-21 14:57:07 -04:30
basics.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
dispatcher.test.php	Adding additional plugin 'shortcut' dispatching tests.	2010-01-15 16:18:19 -05:00