Matias Griese 0c374eac23 Merge branch 'develop' of https://github.com/getgrav/grav into feature/DI ... Conflicts: composer.json index.php system/src/Grav/Common/Grav.php system/src/Grav/Common/Themes.php system/src/Grav/Common/Twig.php		2014-08-18 14:39:50 +03:00
..
config	Merge branch 'develop' of https://github.com/getgrav/grav into feature/DI	2014-08-18 14:39:50 +03:00
data	added placeholder user/data folder back	2014-08-07 11:24:16 -06:00
pages/01.home	Source	2014-08-02 12:12:32 -07:00
plugins	removed these READMEs	2014-08-07 12:33:48 -06:00
themes	removed these READMEs	2014-08-07 12:33:48 -06:00