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
..
admin	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
bookkeeping	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-02 17:56:09 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-27 02:09:40 +02:00
customer	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-02 17:56:09 +02:00
expensereport	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-02 17:56:09 +02:00
journal	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-25 21:11:36 +02:00
report	Fix menu consistency	2017-07-01 03:18:17 +02:00
supplier	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-02 17:56:09 +02:00
tpl	Fix : Accountancy - Debug and add information in database	2017-06-17 07:54:35 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
index.php	Modify code to match new v6 structure.	2017-06-15 19:29:00 +02:00