Laurent Destailleur 3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/stripe/admin/stripe.php

2018-04-13 00:45:39 +02:00

..

index.html

…

stripe.php

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

2018-04-13 00:45:39 +02:00