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

Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php

2017-09-08 13:30:54 +02:00

..

admin

Fix translation and migration

2017-08-20 16:07:38 +02:00

class

Fix error counting in cron

2017-08-03 11:23:23 +02:00

card.php

FIX syntax error with pgsql and frequency lost during cron update.

2017-07-26 12:09:15 +02:00

index.html

…

info.php

Fix dol_banner

2017-06-12 10:25:28 +02:00

list.php

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

2017-09-08 13:30:54 +02:00