Laurent Destailleur cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php

2017-09-15 11:02:34 +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

pdf_soleil.modules.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-09-15 11:02:34 +02:00