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

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php

2016-01-22 03:29:55 +01:00

..

doc_generic_task_odt.modules.php

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

2016-01-22 03:29:55 +01:00

index.html

…