mark_story 8b0a7ee13d Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/VERSION.txt		2012-12-07 20:53:10 -05:00
..
Cache	unify new lines at the end of the file	2012-12-05 15:00:24 +01:00
Config	Add mozilla root CA bundle.	2012-11-11 14:18:07 -05:00
Configure	Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363	2012-12-01 00:09:43 +05:30
Console	fix ticket 3429	2012-12-03 12:31:56 +01:00
Controller	Merge branch 'master' into 2.3	2012-12-07 20:53:10 -05:00
Core	Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363	2012-12-01 00:09:43 +05:30
Error	Docblock fixes	2012-11-29 04:36:29 +05:30
Event	Docblock fixes	2012-11-29 04:36:29 +05:30
I18n	Merge pull request #975 from dereuromark/2.3-i18n	2012-11-28 18:33:39 -08:00
Log	Docblock fixes	2012-11-29 04:36:29 +05:30
Model	Merge branch 'master' into 2.3	2012-12-07 20:53:10 -05:00
Network	Docblock fixes	2012-11-29 04:36:29 +05:30
Routing	unify new lines at the end of the file	2012-12-05 15:00:24 +01:00
Test	Merge branch 'master' into 2.3	2012-12-07 20:53:10 -05:00
TestSuite	unify new lines at the end of the file	2012-12-05 15:00:24 +01:00
Utility	Merge branch 'master' into 2.3	2012-12-07 20:53:10 -05:00
View	Merge pull request #930 from LiquidityC/2.3_3315_viewblock_startifempty	2012-12-01 14:06:55 -08:00
basics.php	Merge branch 'master' into 2.3	2012-11-20 23:02:33 -05:00
bootstrap.php	unify new lines at the end of the file	2012-12-05 15:00:24 +01:00
LICENSE.txt	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
VERSION.txt	Update version number to 2.3.0-RC1	2012-12-02 23:22:43 +01:00