Commit Graph

9 Commits

Author SHA1 Message Date
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
Andy Miller
6e136bf83f Try adding php8 back in to tests 2020-12-15 10:45:35 -07:00
Andy Miller
c5b2440488 remove composer update 2020-12-15 10:04:12 -07:00
Andy Miller
37ce236a43 try forcing token 2020-12-15 10:02:50 -07:00
Andy Miller
31ab55558c remove PHP 8 2020-12-15 09:52:42 -07:00
Djamil Legato
249c2f1e69 Update composer first thing 2020-12-10 11:24:28 -08:00
Djamil Legato
6a4686d17b Update composer first thing 2020-12-10 11:19:27 -08:00
Andy Miller
5184f8e6a3 automated testing for Grav 1.7 commits/prs 2020-12-09 12:08:47 -07:00
Andy Miller
19719ecac1 Added slack to tests 2020-12-07 16:14:16 -07:00