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

Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php

2016-09-09 09:32:14 +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

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

.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

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

style.css.php

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

2016-09-09 09:32:14 +02:00

thumb.png

Optimized theme images

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