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
..
workflows	Merge branch 'develop' into 1.7	2021-01-11 16:29:39 -07:00
FUNDING.yml	Added Funding.yml	2019-05-23 09:44:47 -07:00