Laurent Destailleur a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/lib/project.lib.php

2019-07-25 17:54:14 +02:00

..

doc_generic_shipment_odt.modules.php

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-07-22 19:11:27 +02:00

index.html

…

pdf_espadon.modules.php

Translation lignes -> lines

2019-07-05 21:55:08 +02:00

pdf_merou.modules.php

Work on nblignes -> nblines

2019-06-29 16:38:14 +02:00

pdf_rouget.modules.php

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

2019-07-25 17:54:14 +02:00