Merge origin/master

Conflicts:
	src/java/bdd/PompierMySql.java
	src/java/com/test/servlets/authentifServlet.java
	web/WEB-INF/CreaPompier.jsp
This commit is contained in:
funcha.ahamadi
2021-10-21 17:51:15 +02:00
parent 7b3fd1e8e3
commit b78f08f25e
8 changed files with 92 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
<%-- any content can be specified here e.g.: --%>
<%@ page pageEncoding="UTF-8" %>
<h2></h2>
<p align="center"><img src="image/SDIS-29.png" alt="SDIS 29" /></p>
<p align="center"><img src="image/SDIS-29(1).png" alt="SDIS 29" width="100" height="100"/></p>