Laurent Destailleur f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/fr_FR/members.lang htdocs/langs/fr_FR/stocks.lang htdocs/website/index.php		2019-01-23 19:22:42 +01:00
..
common	Add option to use fontawesome 5 with fontawesome 4	2019-01-03 21:14:59 +01:00
eldy	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-23 19:22:42 +01:00
md	Merge pull request #9871 from laudeco/feature/fontawesome_migration	2018-12-22 19:52:39 +01:00
.gitignore
dolibarr_logo.png
dolibarr_preferred_partner_int.png
dolibarr.png
dolistore_logo.png
index.html
login_logo.png