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

..

confirm_payment.php

add new rule

2020-05-21 15:05:19 +02:00

index.php

Fix restore dir at good place

2020-04-13 04:19:25 +02:00

ipn.php

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

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