Merge branch 'next' into feat/disable-default-redirect

2024-10-31 23:57:51 +11:00
parent 786c8bc3a3 567fe73df7
commit 133ddc09d2
180 changed files with 2400 additions and 1911 deletions
--- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
+++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
@@ -4,7 +4,7 @@
    </x-slot>
    <x-server.navbar :server="$server" :parameters="$parameters" />
    <div class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
+        <x-server.sidebar-proxy :server="$server" :parameters="$parameters" />
        <div class="w-full">
            @if ($server->isFunctional())
                <div class="flex gap-2">