Laurent Destailleur 623a9db4e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ...

Conflicts:
	htdocs/product/composition/card.php
	htdocs/public/notice.php

2020-06-19 00:42:20 +02:00

..

card.php

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

2020-06-19 00:42:20 +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