merge all

2026-05-20 13:11:03 +02:00
parent a5c20dc834 f4bd50c1b1
commit 6a49489b73
1 changed files with 4 additions and 0 deletions
@@ -27,7 +27,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
            ServerAsset::connectAssetToServer($itemtype, $items_id, $server_id);
        }

+<<<<<<< HEAD
        Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.form.php?id=' . $server_id);
+=======
+        Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.php?id=' . $server_id);
+>>>>>>> collegamento_e_verifica_host
    }

    $id = $_POST['id'] ?? 0;