Laurent Destailleur 0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	ChangeLog

2016-01-02 12:27:08 +01:00

..

dolibarr_screenshot2.png

…

dolibarr_screenshot6.png

…

dolibarr_screenshot8.png

…

dolibarr_screenshot9.png

…

index.php

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

2016-01-02 12:27:08 +01:00