mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
Config	Update Configure::load() to use Set::merge()	2012-01-07 10:45:48 -05: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	Merge branch '2.0' into 2.1	2012-01-20 20:28:15 -05:00
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	add missing App::uses()	2012-01-12 18:01:27 +01:00
Plugin	Add files I forgot in previous commit.	2012-01-30 22:29:52 -05: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	2012-02-12 10:06:13 -05:00
webroot	Moving binary data to external file, it was causing failures on other tests.	2011-10-15 18:51:48 +02:00