Merge origin/master

Conflicts: src/java/bdd/PompierMySql.java src/java/com/test/forms/AuthentifForm.java src/java/com/test/forms/NouveauPompForm.java src/java/com/test/servlets/authentifServlet.java
2021-10-21 16:44:28 +02:00
parent d4d16b1360 da2b0c201a
commit 071b58ab9d
8 changed files with 78 additions and 103 deletions
--- a/web/WEB-INF/PompierJSP.jsp
+++ b/web/WEB-INF/PompierJSP.jsp
@@ -12,7 +12,7 @@
        <title>Pompier</title>
    </head>
    <body>
-        <h1>Hello World!</h1>
+        <h1>Bienvenue</h1>
        <a href="ModifPompier"><input type="button" name="btModifP" value="Modifier la fiche pompier"/></a>
    </body>
 </html>