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
This commit is contained in:
Andy Miller
2021-01-11 16:29:39 -07:00
6 changed files with 8 additions and 4 deletions

View File

@@ -27,6 +27,9 @@ jobs:
extensions: opcache, gd
coverage: none
- name: Update composer
run: composer update
- name: Validate composer.json and composer.lock
run: composer validate