From 8ca0bc8a7d3091bb675b931727f16a76a01f3a02 Mon Sep 17 00:00:00 2001 From: "thomas.millot" Date: Mon, 18 Oct 2021 15:38:25 +0200 Subject: [PATCH] Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp --- web/WEB-INF/AuthentificationJSP.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp index 3593709..8c46eb2 100644 --- a/web/WEB-INF/AuthentificationJSP.jsp +++ b/web/WEB-INF/AuthentificationJSP.jsp @@ -6,7 +6,7 @@ <%@include file="jspf/enteteJSPF.jspf" %>

Merci de vous identifier pour acceder aux dossiers

-
+
Identification utilisateur