mark_story a3ae58da09 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/View/View.php		2012-10-01 21:20:25 -04:00
..
Config	Merge branch 'master' into 2.3	2012-10-01 21:20:25 -04:00
Console	remove debug statement that slipped through	2012-07-19 16:05:24 +02:00
Controller	Removed single line of whitespace to fix some coding standards in PagesController in app/	2012-05-01 09:36:08 +10: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	Merge pull request #776 from andraskende/2.2	2012-08-15 16:32:44 -07:00
webroot	move charset/App.encoding into CakeResponse	2012-09-27 20:28:19 +02: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