Merge remote-tracking branch 'origin/stable' into master

# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-10-01 22:08:27 +01:00
commit 4492c80af1

View File

@ -13,4 +13,8 @@ cache:
- $HOME/.composer/cache/vcs
notifications:
email: false
email:
recipients:
- team@pmmp.io
on_success: change
on_failure: always