Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-04 05:40:09 +01:00
Code Issues Packages Projects Releases Activity
Files
ecb412ea6dcc3ced0e761c9411b00bbcc2f708d6
Grav/user/config
History
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
..
site.yaml
Source
2014-08-02 12:12:32 -07:00
system.yaml
Merge branch 'develop' of https://github.com/getgrav/grav into feature/DI
2014-08-18 14:39:50 +03:00