Merge branch 'next-minor'

# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-04-19 12:56:44 +01:00
5 changed files with 5 additions and 6 deletions

View File

@ -2,7 +2,6 @@ dist: xenial
language: php
php:
- 7.2
- 7.3
before_script: