Laurent Destailleur 1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 ...

Conflicts:
	htdocs/core/class/notify.class.php

2019-12-01 00:58:01 +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 '8.0' of https://github.com/dolibarr/dolibarr into 9.0

2019-12-01 00:58:01 +01:00

thirdpartyMargins.php

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

2018-11-08 20:19:28 +01:00