Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor 2019-12-03 19:59:35 +00:00
commit 2ae37cc1c5
2 changed files with 1 additions and 0 deletions

1
.gitignore vendored
View File

@ -13,6 +13,7 @@ server.properties
memory_dumps/* memory_dumps/*
resource_packs/ resource_packs/
server.lock server.lock
/phpstan.neon
# Common IDEs # Common IDEs
.idea/ .idea/