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

Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php

2019-01-23 19:22:42 +01:00

..

ckeditor

Merge remote-tracking branch 'upstream/develop' into trimtrailing

2018-08-12 18:21:59 +02:00

img

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

tpl

…

.gitignore

…

AUTHOR

…

graph-color.php

…

index.html

…

style.css.php

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

2019-01-23 19:22:42 +01:00

thumb.png

…