mark_story 6d269ce25d Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Config/config.php lib/Cake/Console/Command/Task/ModelTask.php lib/Cake/Console/Command/TestsuiteShell.php lib/Cake/Model/CakeSchema.php lib/Cake/Model/Datasource/Database/Sqlite.php lib/Cake/Test/Case/Model/ModelTestBase.php lib/Cake/Test/Case/Routing/DispatcherTest.php lib/Cake/Test/Case/Utility/FileTest.php lib/Cake/VERSION.txt		2011-12-03 13:45:28 -05:00
..
Config	Remove tests, that interact with RedirectRoute.	2011-10-22 23:27:04 -04:00
Console	Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes.	2011-11-07 01:01:56 +01:00
Controller	Moving AppModel, AppController, PagesController out of core to app	2011-11-12 22:30:42 +05:30
Lib	Remove whitespace [Gun.io WhitespaceBot]	2011-10-28 18:25:08 -04:00
Locale	Remove whitespace [Gun.io WhitespaceBot]	2011-10-28 18:25:08 -04:00
Model	Merge branch '2.1' of github.com:cakephp/cakephp into 2.1	2011-11-15 23:11:07 -05:00
Plugin	Adhere to code formatting standard	2011-11-30 23:21:31 -08:00
tmp	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Vendor	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
View	Merge branch '2.0' into 2.1	2011-12-03 13:45:28 -05:00
webroot	Moving binary data to external file, it was causing failures on other tests.	2011-10-15 18:51:48 +02:00