Merge branch '2.1.x' of https://github.com/Yupsie/magento2-module-mai… · weprovide/magento2-module-mailattachment@51ed9de · GitHub

This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Merge branch '2.1.x' of https://github.com/Yupsie/magento2-module-mai…

Browse files

…lattachment

# Conflicts:
#	Mail/Template/TransportBuilder.php

Loading branch information

Sander Hartman committed Jan 8, 2020

2 parents 7bd628f + 4f6185e commit 51ed9de