Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-23 15:11:27 +01:00
Code Issues Packages Projects Releases Activity
Files
0f87946276d3a75d004f7bf80b9c8c2f06d39717
Grav/bin
History
Matias Griese f606999c40 Merge branch 'develop' of https://github.com/getgrav/grav into feature/multi-config 
Conflicts:
	composer.json
	system/config/streams.yaml
	system/src/Grav/Common/Page/Page.php
	system/src/Grav/Common/Theme.php
	system/src/Grav/Common/Themes.php
	system/src/Grav/Component/Filesystem/ResourceLocator.php
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
2014-09-03 10:33:02 +03:00
..
grav
Merge branch 'develop' of https://github.com/getgrav/grav into feature/multi-config
2014-09-03 10:33:02 +03:00