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

Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php

2018-03-08 16:37:17 +01:00

..

api_categories.class.php

Fix maxi debug of APIs (clean output fields)

2017-12-21 16:50:18 +01:00

categorie.class.php

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

2018-03-08 16:37:17 +01:00

index.html

…