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

Conflicts:
	htdocs/langs/en_US/website.lang
	htdocs/theme/eldy/style.css.php
	htdocs/websites/class/website.class.php
	htdocs/websites/index.php

2017-07-20 18:31:58 +02:00

..

common

Remove deprecated files

2017-05-25 19:38:42 +02:00

eldy

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

2017-07-20 18:31:58 +02:00

md

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

2017-07-20 18:31:58 +02:00

.gitignore

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

2015-09-22 16:28:34 +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

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_logo.png

…