elimina pippo.txt

merge all
pippo.txt
2026-05-20 13:16:07 +02:00 · 2026-05-20 13:11:03 +02:00 · 2026-05-20 12:25:45 +02:00 · 2026-05-20 11:16:14 +02:00
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;
Author	SHA1	Message	Date
mariano	6441a8636d	elimina pippo.txt	2026-05-20 13:16:07 +02:00
mariano	6a49489b73	merge all	2026-05-20 13:11:03 +02:00
mariano	a5c20dc834	pippo.txt	2026-05-20 12:25:45 +02:00
mariano	f4bd50c1b1	pulsanti e sistemazione create client	2026-05-20 11:16:14 +02:00