Merge origin/master

Conflicts: src/java/bdd/PompierMysql.java
2021-10-21 14:33:44 +02:00
parent ff03911709
commit 3cfc1f99e4
2 changed files with 4 additions and 1 deletions
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -26,6 +26,6 @@
                    <p>${message}</p>
                </fieldset>
    </form>
-    <br /><br/>
+    <br/><br/>
 </div>
 </html>