Laurent Destailleur fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang		2017-08-02 17:56:09 +02:00
..
card.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2017-07-14 00:24:49 +02:00
index.html	Integrate module Accounting Expert	2014-08-27 07:03:42 +02:00
index.php	Fix pgsql compatibility	2017-07-01 13:31:44 +02:00
lines.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
list.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00