Dylan K. Taylor b8bbfdb181 Merge commit 'c572e9bb6a787d0573e7999b38f4651fc48cec58'
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
2020-06-26 18:43:43 +01:00
..