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

..

common

Remove deprecated files

2017-05-25 19:38:42 +02:00

eldy

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

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

md

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

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

.gitignore

…

dolibarr_logo.png

NEW Add last activation author and ip of modules

2017-05-06 20:43:14 +02:00

dolibarr_preferred_partner_int.png

…

dolibarr.png

…

dolistore_logo.png

…

index.html

…

login_logo.png

…