Merge branch 'next-minor'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-04 14:14:09 +01:00
commit b8e57282e3

6
.gitignore vendored
View File

@ -43,3 +43,9 @@ test_data/*
# Doxygen # Doxygen
Documentation/* Documentation/*
# PHPUnit
/.phpunit.result.cache
# php-cs-fixer
/.php_cs.cache