Merge commit '0f6dc9082a781fcc6f70f3d3e05bd261c6f6c203'

# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-06-26 18:49:11 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -50,7 +50,7 @@
"respect/validation": "^2.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.29",
"phpstan/phpstan": "0.12.29",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"