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

Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php

2020-10-01 19:43:23 +02:00

..

actions_stripe.class.php

Fix escaping

2020-09-20 03:32:43 +02:00

index.html

…

stripe.class.php

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

2020-10-01 19:43:23 +02:00