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

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php

2020-03-04 19:28:15 +01:00

..

api_expensereports.class.php

…

expensereport_ik.class.php

…

expensereport_rule.class.php

…

expensereport.class.php

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

2020-03-04 19:28:15 +01:00

expensereportstats.class.php

…

index.html

…

paymentexpensereport.class.php

…