Laurent Destailleur 524dd79198 Merge remote-tracking branch 'origin/4.0' into develop ...

Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php

2016-08-31 00:16:07 +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

…

AUTHOR

…

graph-color.php

Fixed md theme name

2015-12-04 18:04:41 +01:00

index.html

…

style.css.php

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

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

thumb.png

…