Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java
	web/WEB-INF/ProfilJSP.jsp
This commit is contained in:
thomas.millot
2021-12-14 08:44:24 +01:00
commit eae43733b0
45 changed files with 5162 additions and 0 deletions

2
web/META-INF/context.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/sdis29M1"/>