Skip to content
Commit 41e4a02e authored by José Lorenzo Rodríguez's avatar José Lorenzo Rodríguez
Browse files

Merge pull request #2874 from cakephp/3.1-mailer-fix-conflicts 

3.1 mailer fix conflicts
parents 95127ef4 c496e130
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment