Laurent Destailleur cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php

2018-12-01 18:19:45 +01:00

..

doc_generic_contract_odt.modules.php

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

2018-10-31 15:38:29 +01:00

index.html

…

pdf_strato.modules.php

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

2018-12-01 18:19:45 +01:00