2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/htdocs/accountancy/journal
Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
..