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

Commit

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

Browse files

Conflicts:
	htdocs/product/card.php

Loading branch information

eldy committed Feb 18, 2020

2 parents ce09ec8 + fa16063 commit 51bc20a