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

Dieser Commit ist enthalten in:

Daniel Seifert

2021-03-15 15:21:26 +01:00

Ursprung bd130b5352 a55f116615

Commit 236ab819a6

Signiert von:

DanielS

GPG-Schlüssel-ID: 8A7C4C6ED1915C6F

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

Keine Diff-Daten verfügbar