mirror of
https://github.com/pelican-dev/panel.git
synced 2025-11-01 00:56:51 +01:00
0a6b846230
# Conflicts: # app/Filament/Resources/ServerResource/Pages/CreateServer.php # app/Filament/Resources/ServerResource/Pages/EditServer.php # app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php # app/Services/Allocations/AssignmentService.php # database/Seeders/eggs/minecraft/egg-bungeecord.json # database/Seeders/eggs/minecraft/egg-forge-minecraft.json # database/Seeders/eggs/minecraft/egg-paper.json # database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json # database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json # database/Seeders/eggs/rust/egg-rust.json # database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json # database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json # database/Seeders/eggs/source-engine/egg-garrys-mod.json # database/Seeders/eggs/source-engine/egg-insurgency.json # database/Seeders/eggs/source-engine/egg-team-fortress2.json # database/Seeders/eggs/voice-servers/egg-mumble-server.json # database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json