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

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/theme/eldy/style.css.php

2017-05-05 14:14:21 +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-05-05 14:14:21 +02:00

md

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

2017-05-05 14:14:21 +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

Fix: Typo and translation

2014-12-17 01:56:36 +01:00

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

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

login_background.png

Optimized theme images

2014-08-19 12:39:25 +02:00

login_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00