Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source

Conflicts:
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php

...

This commit is contained in:

Laurent Destailleur 2020-02-03 06:35:27 +01:00

parent 87f84e5b17 2813c9d4b4

commit 2cb414e17e

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files