clementine.desrucques c1b8fa7a27 Merge origin/master ...

Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css

2021-12-13 17:37:55 +01:00

..

ant-deploy.xml

Merge origin/master

2021-12-13 10:28:40 +01:00

build-impl.xml

Merge origin/master

2021-12-13 11:07:06 +01:00

genfiles.properties

Merge origin/master

2021-12-13 11:07:06 +01:00

project.properties

Merge origin/master

2021-12-13 17:37:55 +01:00

project.xml

Merge origin/master

2021-12-13 11:07:06 +01:00