Dylan K. Taylor 305b4007d2 Merge commit '6490a49c702d0a3a9f62ffb915ffa22272f17b08' ...

# Conflicts:
#	resources/vanilla
#	tests/travis.sh

2020-01-04 16:25:40 +00:00

..

phpstan

phpstan: 0.12.3 fixes for master

2019-12-29 17:55:03 +00:00

phpunit

Merge remote-tracking branch 'origin/stable'

2019-10-01 14:41:54 +01:00

plugins

Merge branch 'stable' with changes

2019-11-09 18:01:04 +00:00

travis.sh

Merge commit '5cd7e11b298a35bf796b41b577c28441e41ff411'

2020-01-04 16:24:29 +00:00