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

Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php

2020-04-12 17:01:44 +02:00

..

card.php

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

2020-04-12 17:01:44 +02:00

index.html

…