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:
@@ -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>
|
||||
|
Reference in New Issue
Block a user