Andy Miller 9b34178332 Merge branch 'develop' into 1.7 ...

# Conflicts:
#	composer.lock
#	system/defines.php
#	system/src/Grav/Common/Page/Medium/ImageMedium.php
#	system/src/Grav/Common/Page/Page.php
#	system/src/Grav/Common/Twig/TwigExtension.php

2021-01-11 16:29:39 -07:00

..

build.yaml

should skip release of prerelease

2020-12-15 11:12:54 -07:00

tests.yaml

Merge branch 'develop' into 1.7

2021-01-11 16:29:39 -07:00