Laurent Destailleur 533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/fr_FR/accountancy.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cashdesk.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/members.lang htdocs/langs/fr_FR/products.lang		2022-08-12 16:03:09 +02:00
..
admin	Del file lang	2022-07-29 08:51:57 +02:00
index.php	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-08-12 16:03:09 +02:00