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 · 2024-09-03 18:36:18 +02:00 · 7b898aef8f
Commit 7b898aef8f
--- a/views/twig/admin/d3orderoverview_pdfform.html.twig
+++ b/views/twig/admin/d3orderoverview_pdfform.html.twig
@ -0,0 +1 @@
+new content here