Merge origin/master

Conflicts: src/java/bdd/PompierMysql.java web/WEB-INF/ProfilJSP.jsp
2021-12-14 08:44:24 +01:00
commit eae43733b0
45 changed files with 5162 additions and 0 deletions
--- a/web/index.html
+++ b/web/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Html.html to edit this template
+-->
+<html>
+    <head>
+        <title>TODO supply a title</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    </head>
+    <body>
+        <div>TODO write content</div>
+    </body>
+</html>