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

Browse Source

develop

Conflicts:
	htdocs/takepos/takepos.php

...

This commit is contained in:

Laurent Destailleur 2019-03-27 19:37:25 +01:00

parent 579525ec48 3592283fc9

commit 0dc8082179

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

Diff Content Not Available