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

develop

Conflicts:
	htdocs/theme/md/style.css.php

2015-11-20 23:47:07 +01:00

..

ckeditor

…

img

Debug and rename experimental module "supplier proposal". Still work to

2015-11-15 19:23:39 +01:00

tpl

…

.gitignore

…

AUTHOR

…

graph-color.php

…

index.html

…

style.css.php

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

2015-11-20 23:47:07 +01:00

thumb.png

…