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

Conflicts:
	htdocs/core/actions_sendmails.inc.php

2017-09-16 12:22:18 +02:00

..

card.php

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

2017-09-16 12:22:18 +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