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

Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php

2018-11-08 20:18:13 +01: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

productMargins.php

Merge

2018-10-09 17:06:08 +02:00

thirdpartyMargins.php

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

2018-11-08 20:18:13 +01:00