Laurent Destailleur 7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/theme/md/style.css.php

2016-06-22 15:31:56 +02:00

..

common

More neutral picto for EDM module

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

eldy

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

2016-06-22 15:31:56 +02:00

md

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

2016-06-22 15:31:56 +02:00

.gitignore

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-09-22 16:28:34 +02:00

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

…