Merge branch 'develop' of github.com:getgrav/grav into 1.7

Browse Source

 Conflicts:

	system/src/Grav/Common/Processors/ConfigurationProcessor.php

...

This commit is contained in:

Matias Griese

2021-01-14 17:16:27 +02:00

parent aea01a3937 561b91894c

commit fdfcaaeb39

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available