Laurent Destailleur f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/takepos/takepos.php		2019-09-27 14:11:14 +02:00
..
common	Updat fontawesome to 5.10.2	2019-09-02 16:13:11 +02:00
eldy	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-27 14:11:14 +02:00
md	FIX #11931 #11963	2019-09-27 11:51:34 +02:00
.gitignore
dolibarr_logo_squarred.png	Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED,	2019-09-16 15:26:13 +02:00
dolibarr_logo.png	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png
dolibarr.png
dolistore_logo.png
index.html
login_logo.png