mark_story f8966a64f2 Merge branch '2.1' into 2.2 ... Conflicts: lib/Cake/Test/Case/Network/Email/CakeEmailTest.php		2012-04-09 21:55:02 -04:00
..
Config	Added "missing" comma after smtp log option.	2012-04-08 21:09:05 -04:00
Console	Fix the way bash is invoked.	2012-03-15 20:20:39 -04:00
Controller	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
Lib	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Locale/eng/LC_MESSAGES	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Model	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
Plugin	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Test	removing 'empty' files from nonempty directories	2011-10-19 12:19:28 +07:00
tmp	fix file permissions	2011-03-16 16:06:44 +01:00
Vendor	Adding missing Vendor directory.	2011-07-28 16:31:19 -04:00
View	Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682	2012-03-18 14:05:41 +05:30
webroot	Fixing issues with unwanted querystring parameters.	2012-03-14 20:20:55 -04:00
.htaccess	Remove extraneous space in .htaccess	2012-02-17 21:32:09 -08:00
index.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00