Laurent Destailleur a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php		2022-04-01 14:40:50 +02:00
..
.gitignore	Add ignore	2021-03-11 12:47:55 +01:00
.htaccess
conf.php.example	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-04-01 14:40:50 +02:00