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

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php

2019-08-15 23:39:02 +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

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

pdf_espadon.modules.php

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

2019-08-15 23:39:02 +02:00

pdf_merou.modules.php

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

2019-08-15 23:39:02 +02:00

pdf_rouget.modules.php

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

2019-08-15 23:39:02 +02:00