Skip to content

Commit

Permalink
Merge pull request #2827 from tidusjar/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tidusjar authored Feb 19, 2019
2 parents 771ff2b + 9a9357d commit c0040bf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion src/Ombi.Notifications.Templates/EmailBasicTemplate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public override string TemplateLocation
if (string.IsNullOrEmpty(_templateLocation))
{
#if DEBUG
_templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "bin", "Debug", "netcoreapp2.0", "Templates",
_templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "bin", "Debug", "netcoreapp2.2", "Templates",
"BasicTemplate.html");
#else
_templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "Templates","BasicTemplate.html");
Expand Down
5 changes: 0 additions & 5 deletions src/Ombi.Notifications/GenericEmailProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ public async Task SendAdHoc(NotificationMessage model, EmailNotificationSettings

using (var client = new SmtpClient())
{
if (customization.ApplicationUrl.HasValue())
{
client.LocalDomain = customization.ApplicationUrl;
}

if (settings.DisableCertificateChecking)
{
// Disable validation of the certificate associated with the SMTP service
Expand Down

0 comments on commit c0040bf

Please sign in to comment.