Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot
2021-10-18 15:25:33 +02:00
parent 5a0ba05682
commit ffd7162dde
2 changed files with 4 additions and 5 deletions

BIN
web/images/LogoSDIS29.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB