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

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php

2020-06-07 19:55:48 +02:00

..

mailings

add new rule

2020-05-21 09:35:30 +02:00

mymodule

Debug modulebuilder for doc generation

2020-06-01 16:47:50 +02:00

modMyModule.class.php

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

2020-06-07 19:55:48 +02:00