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

Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php

2019-10-10 10:37:17 +02:00

..

api_categories.class.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

categorie.class.php

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

2019-10-10 10:37:17 +02:00

index.html

…