Laurent Destailleur 4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php

2018-08-16 14:50:04 +02:00

..

doc_generic_project_odt.modules.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-16 14:50:04 +02:00

index.html

…

pdf_baleine.modules.php

…

pdf_beluga.modules.php

…

pdf_timespent.modules.php

…