Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	templates/email/default2020/assets/img/logo.png
#	templates/frontOffice/default2020/assets/dist/img/logo_fr.png
#	templates/pdf/default2020/assets/img/logo.png

...

This commit is contained in:

TheCoreDev

2020-06-24 13:03:09 +02:00

parent f126293c7c 7b90674719

commit 6810659202

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