Laurent Destailleur 408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php

2019-01-30 16:54:38 +01:00

..

ckeditor

Merge remote-tracking branch 'upstream/develop' into trimtrailing

2018-08-12 18:21:59 +02:00

img

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

tpl

…

.gitignore

Prepare freeze

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

AUTHOR

…

graph-color.php

PSR2.Files.EndFileNewline.TooMany

2019-01-27 14:10:35 +01:00

index.html

…

style.css.php

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

2019-01-30 16:54:38 +01:00

thumb.png

…