Dane Everitt 84e3153e71 Merge pull request #3179 from pterodactyl/fix/backup-restore ... fix: backup restore delete all files		2021-03-21 10:22:10 -07:00
..
lang/en	Merge branch 'develop' into dane/restore-backups	2021-01-30 10:10:29 -08:00
scripts	Merge pull request #3179 from pterodactyl/fix/backup-restore	2021-03-21 10:22:10 -07:00
views	Don't require auto-allocation settings if not enabled; closes #3085	2021-02-17 21:11:23 -08:00