Laurent Destailleur 1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php		2019-11-14 21:30:16 +01:00
..
doc	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-14 21:30:16 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
mod_facture_mars.php	Standardization	2019-10-18 12:43:25 +02:00
mod_facture_mercure.php	Standardization	2019-10-18 12:51:49 +02:00
mod_facture_terre.php	Standardization	2019-10-18 12:56:40 +02:00
modules_facture.php	Standardization	2019-10-18 13:00:31 +02:00