Laurent Destailleur 402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php

2017-08-04 15:39:00 +02:00

..

ckeditor

Debug module website

2017-07-09 22:30:19 +02:00

img

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

2017-08-04 15:39:00 +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 branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-08-01 10:22:37 +02:00

thumb.png

…