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

develop

Conflicts:
	htdocs/product/price.php

2017-12-22 12:55:16 +01:00

..

ckeditor

Fix regression

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

img

Fix menu with smartphone

2017-12-08 19:23:13 +01:00

tpl

…

.gitignore

…

AUTHOR

…

graph-color.php

Fix menu with smartphone

2017-12-08 19:23:13 +01:00

index.html

…

style.css.php

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

2017-12-22 12:55:16 +01:00

thumb.png

…