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

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php

2016-12-26 12:42:23 +01:00

..

doc_generic_proposal_odt.modules.php

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

2016-06-05 02:20: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_azur.modules.php

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

2016-12-26 12:42:23 +01:00