thomas.millot 5a0ba05682 Merge origin/master ...

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp

2021-10-18 15:11:37 +02:00

..

META-INF

2021-10-18 11:18:06 +02:00

WEB-INF

Merge origin/master

2021-10-18 15:11:37 +02:00

index.html

2021-10-18 11:18:06 +02:00