MaxBuhe01 7b898aef8f Merge remote-tracking branch 'origin/dev_2.x_OXID7' into dev_2.x_OXID7 ...

# Conflicts:
#	views/twig/extensions/themes/admin_twig/order_overview.html.twig

2024-09-03 18:36:18 +02:00

..

smarty

[Fixed] wrong template alias for d3styles

2024-08-27 15:44:32 +02:00

twig

Merge remote-tracking branch 'origin/dev_2.x_OXID7' into dev_2.x_OXID7

2024-09-03 18:36:18 +02:00