From d2d38a279b4007e4e93e2fff0a77658766e6946c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 22 May 2021 13:48:14 +0200
Subject: [PATCH] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 5a3b06c..4dea48d 100644
--- a/check_process
+++ b/check_process
@@ -24,7 +24,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=399a71c4a657a6ba28a361ade71ec767540a7986
+		upgrade=1	from_commit=fe5e2835ae657591db200cd9c71e4d2fb21840f8
 		backup_restore=1
 		multi_instance=1
 		port_already_use=1	(66)
@@ -35,6 +35,6 @@
 Email=
 Notification=change
 ;;; Upgrade options
-	; commit=399a71c4a657a6ba28a361ade71ec767540a7986
-		name=Merge pull request
+	; commit=fe5e2835ae657591db200cd9c71e4d2fb21840f8
+		name=Merge branch 'testing' into master
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&is_public=1&