Merge branch 'develop' into feature/vue-serverview
This commit is contained in:
commit
5ca13839cf
110 changed files with 7190 additions and 2093 deletions
9
.gitignore
vendored
9
.gitignore
vendored
|
@ -19,5 +19,14 @@ public/assets/*
|
|||
.dockerignore
|
||||
Dockerfile
|
||||
docker-compose.yml
|
||||
# for image related files
|
||||
misc
|
||||
.phpstorm.meta.php
|
||||
.php_cs.cache
|
||||
|
||||
coverage.xml
|
||||
|
||||
# Vagrant
|
||||
*.log
|
||||
resources/lang/locales.js
|
||||
resources/assets/pterodactyl/scripts/helpers/ziggy.js
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue