Merge remote-tracking branch 'pterodactyl/release/v0.7.10' into feature/add-dockerfile

This commit is contained in:
Michael (Parker) Parker 2018-09-16 13:46:45 -04:00
commit 1ae245ac82
116 changed files with 7210 additions and 2104 deletions

2
.gitignore vendored
View file

@ -28,5 +28,7 @@ misc
.phpstorm.meta.php
.php_cs.cache
coverage.xml
# Vagrant
*.log