Merge origin/master
Conflicts: web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
parent
a0deb75318
commit
d13cdc2f75
@ -155,4 +155,5 @@ public class PompierMysql {
|
||||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user