thomas.millot 9c667fbe9a Merge origin/master ...

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp

2021-10-18 15:32:53 +02:00

..

ant-deploy.xml

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

build-impl.xml

2021-10-18 14:32:43 +02:00

genfiles.properties

Merge origin/master

2021-10-18 15:32:53 +02:00

project.properties

Merge origin/master

2021-10-18 15:32:53 +02:00

project.xml

Merge origin/master

2021-10-18 15:32:53 +02:00