Laurent Destailleur 6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 ...

Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php

2019-12-01 10:30:22 +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 branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0

2019-12-01 10:30:22 +01:00

thirdpartyMargins.php

Fix CSS

2019-07-27 01:13:39 +02:00