Laurent Destailleur 6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/langs/en_US/website.lang

2018-02-15 15:34:17 +01:00

..

ckeditor

Fix regression

2017-12-12 10:13:48 +01:00

img

Fix class not found

2017-11-25 16:52:04 +01:00

tpl

…

.gitignore

…

AUTHOR

…

graph-color.php

Fix bookmark jump

2017-05-06 21:39:00 +02:00

index.html

…

style.css.php

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

2018-02-15 15:34:17 +01:00

thumb.png

…