Merge branch 'develop' into dane/restore-backups

2021-01-30 10:10:29 -08:00 · 2021-01-30 10:10:29 -08:00 · be26921fcc
commit be26921fcc
parent 0dd0f09238 8c2d1cdffc
41 changed files with 440 additions and 362 deletions
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@ -80,7 +80,7 @@ class ServerConfigurationStructureService
            }),
            'egg' => [
                'id' => $server->egg->uuid,
-                'file_denylist' => explode(PHP_EOL, $server->egg->inherit_file_denylist),
+                'file_denylist' => $server->egg->inherit_file_denylist,
            ],
        ];
    }