mark_story edcbf4e92f Manually port f287bc76c0 to 2.6 ... Git won't let me merge the changes as I have 'unstaged changes'.		2014-05-27 20:54:36 -04:00
..
Config	Merge branch 'master' into 2.5	2014-03-03 21:20:58 -05:00
Console	Manually port f287bc76c0 to 2.6	2014-05-27 20:54:36 -04:00
Controller	Merge pull request #2350 from tuffz/formatting_app_uses_blocks	2013-12-14 12:37:02 -08: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	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01: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	correct templates	2014-01-03 13:28:45 +01:00
webroot	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
.htaccess	Remove extraneous space in .htaccess	2012-02-17 21:32:09 -08:00
index.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00