Merge commit 'dfbd85777'

# Conflicts:
#	resources/vanilla
#	src/VersionInfo.php
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:21:43 +01:00
commit d82264fe60

Diff Content Not Available