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

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php

2019-09-27 14:11:14 +02:00

..

ckeditor

Fix when using image into description

2019-01-31 18:12:34 +01:00

doc

fix travis

2019-03-07 15:49:16 +01:00

img

Merge branch 'develop' into develop_new_dashboard

2019-08-18 01:26:56 +02:00

tpl

…

.gitignore

…

AUTHOR

…

badges.inc.php

Fix color badges and status for color blind

2019-08-07 17:22:59 +02:00

btn.inc.php

Sync transifex

2019-06-22 13:18:33 +02:00

dropdown.inc.php

Sync transifex

2019-06-22 13:18:33 +02:00

global.inc.php

FIX #11931 #11963

2019-09-27 11:51:34 +02:00

index.html

…

info-box.inc.php

Auto remove basic stats if in new opened dashboard

2019-09-22 20:59:28 +02:00

main_menu_fa_icons.inc.php

Fix typo

2019-03-16 14:48:41 +01:00

progress.inc.php

Fix task widget and improve its display

2019-08-10 22:48:07 +02:00

style.css.php

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

2019-09-27 14:11:14 +02:00

theme_vars.inc.php

css

2019-09-03 11:42:47 +02:00

thumb.png

…