Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into · Dolibarr/dolibarr@0dc8082 · GitHub

Commit

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

Browse files

develop

Conflicts:
	htdocs/takepos/takepos.php

Loading branch information

eldy committed Mar 27, 2019

2 parents 579525e + 3592283 commit 0dc8082