Merge origin/master

Conflicts: web/WEB-INF/AuthentificationJSP.jsp
2021-10-19 08:51:43 +02:00
parent cc1a3760ef
commit caf65f4bfe
5 changed files with 11 additions and 33 deletions
--- a/web/WEB-INF/ModifProfilJSP.jsp
+++ b/web/WEB-INF/ModifProfilJSP.jsp
@@ -1,7 +1,7 @@
 <%-- 
    Document   : ModifProfilJSP
    Created on : 18 oct. 2021, 11:10:01
-    Author     : Chelloug.Eliass
+    Author     : Millot.thomas
 --%>

 <%@page contentType="text/html" pageEncoding="UTF-8"%>