Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	local/modules/ColissimoWs/templates/email/default2020/order_shipped.html

...

This commit is contained in:

TheCoreDev

2023-04-15 11:33:15 +02:00

parent 0355f9f001 95acc6902e

commit b7877511d6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available