Laurent Destailleur 386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/website.lib.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php		2019-08-15 23:39:02 +02:00
..
common	Upgrade font awesome to 5.7.2	2019-03-12 09:13:16 +01:00
eldy	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-15 23:39:02 +02:00
md	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-15 23:39:02 +02:00
.gitignore
dolibarr_logo.png
dolibarr_preferred_partner_int.png
dolibarr.png
dolistore_logo.png
index.html
login_logo.png