Merge origin/master
Conflicts: src/java/bdd/PompierMysql.java web/WEB-INF/ProfilJSP.jsp
This commit is contained in:
2
web/META-INF/context.xml
Normal file
2
web/META-INF/context.xml
Normal file
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Context path="/sdis29M1"/>
|
||||
Reference in New Issue
Block a user