Laurent Destailleur 8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/hrm/hrm.php

2016-08-31 16:16:19 +02:00

..

ckeditor

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +02:00

img

NEW Reduce nb of picto on ref into list, merging preview and download

2016-08-05 12:20:11 +02:00

tpl

…

.gitignore

Prepare freeze

2014-11-07 21:52:50 +01:00

AUTHOR

…

graph-color.php

Better contrat on image colors

2015-07-14 12:24:24 +02:00

index.html

…

style.css.php

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

2016-08-31 16:16:19 +02:00

thumb.png

Optimized theme images

2014-08-19 12:39:25 +02:00