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

..

boxes

Reindent module template

2020-05-01 08:40:55 +02:00

modules

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

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

tpl

Reindent module template

2020-05-01 08:40:55 +02:00

triggers

Reindent module template

2020-05-01 08:40:55 +02:00