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

…

mod_commande_marbre.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

mod_commande_saphir.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

modules_commande.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00