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

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php

2017-09-13 20:57:53 +02:00

..

doc_generic_shipment_odt.modules.php

NEW Generated files are now indexed in database

2017-08-18 23:19:55 +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_merou.modules.php

NEW Generated files are now indexed in database

2017-08-18 23:19:55 +02:00

pdf_rouget.modules.php

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

2017-09-13 20:57:53 +02:00