Laurent Destailleur e7072185ab Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/comm/propal.php

2016-05-18 20:47:57 +02:00

..

holiday.class.php

Merge remote-tracking branch 'origin/3.9' into develop

2016-05-18 20:47:57 +02:00

index.html

…