Laurent Destailleur 848f70e026 Fix bad merge

2017-06-14 10:38:34 +02:00

..

common

More neutral picto for EDM module

2016-05-22 14:39:34 +02:00

eldy

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-06-14 10:18:24 +02:00

md

Fix bad merge

2017-06-14 10:38:34 +02:00

.gitignore

…

dolibarr_logo.png

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

dolibarr_preferred_partner_int.png

…

dolibarr.png

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

doliforge_logo.png

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

dolistore_logo.png

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

index.html

…

login_background.png

…

login_logo.png

…