Merge origin/master
Conflicts: web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
BIN
web/images/LogoSDIS29.jpg
Normal file
BIN
web/images/LogoSDIS29.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 54 KiB |
Reference in New Issue
Block a user