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

Browse Source

# 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

parent bd130b5352 a55f116615

commit 236ab819a6

Signed by: DanielS

GPG Key ID: 8A7C4C6ED1915C6F

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