Laurent Destailleur d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/admin/defaultvalues.php htdocs/societe/card.php		2019-01-08 01:53:00 +01:00
..
bankjournal.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-08 01:53:00 +01:00
expensereportsjournal.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
index.html
purchasesjournal.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
sellsjournal.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00