Merge branch 'rel_ioncube_PHP71-72' of git.d3data.de:D3Public/Ordermanager into rel_ioncube_PHP71-72

# Conflicts:
#	src/Application/Controller/Admin/d3_cfg_ordermanageritem_mall.php
#	src/Application/Controller/Admin/d3_cfg_ordermanageritem_overview.php
This commit is contained in:
Daniel Seifert 2021-03-15 15:21:26 +01:00
bovenliggende bd130b5352 a55f116615
commit 236ab819a6
Getekend door: DanielS
GPG sleutel-ID: 8A7C4C6ED1915C6F

Diff gegevens niet beschikbaar