Laurent Destailleur 42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php

2019-04-02 19:41:58 +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

margins.lib.php

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

2019-04-02 19:41:58 +02:00