Improvement in resend emails
Merge pull request #2336 from julceslauhub/master

Improvement in resend emails