Merge remote-tracking branch 'origin/stable'

This commit is contained in:
Dylan K. Taylor
2021-05-07 20:47:35 +01:00
17 changed files with 159 additions and 1 deletions

4
.gitignore vendored
View File

@ -19,7 +19,9 @@ server.lock
/phpstan.neon
# Common IDEs
.idea/
.idea/*
!.idea/codeStyles/
!.idea/fileTemplates/
nbproject/*
# Windows image file caches