Laurent Destailleur 3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang

2018-09-02 15:48:26 +02:00

..

admin

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

2018-09-02 15:48:26 +02:00

img

…

lib

…

index.html

…