Regis Houssin db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php		2017-09-15 16:45:49 +02:00
..
class	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-09-15 16:45:49 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00
document.php	Look and feel v6	2017-05-21 02:43:51 +02:00
index.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
info.php	Fix missing $form	2017-08-22 10:02:45 +02:00
payments.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00