]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail...
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>
Fri, 4 Sep 2020 17:53:02 +0000 (19:53 +0200)
committerGitHub <noreply@github.com>
Fri, 4 Sep 2020 17:53:02 +0000 (19:53 +0200)
1  2 
apps/settings/tests/Mailer/NewUserMailHelperTest.php
lib/private/Mail/EMailTemplate.php

Simple merge