Laurent Destailleur 99ed9c4589 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/compta/facture/list.php

2018-04-08 13:10:10 +02:00

..

ckeditor

Fix regression

2017-12-12 10:13:48 +01:00

img

Work on ticket module integration

2018-03-13 12:13:47 +01:00

tpl

…

.gitignore

…

AUTHOR

…

graph-color.php

Fix bookmark jump

2017-05-06 21:39:00 +02:00

index.html

…

style.css.php

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

2018-04-08 13:10:10 +02:00

thumb.png

…