Laurent Destailleur c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php		2017-08-26 22:33:56 +02:00
..
bankjournal.php	Fix: change old email	2017-08-23 21:23:18 +02:00
expensereportsjournal.php	Fix: change old email	2017-08-23 21:23:18 +02:00
index.html
purchasesjournal.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-26 22:33:56 +02:00
sellsjournal.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-26 22:33:56 +02:00