Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Conflicts:
	src/Umbraco.Core/Services/NotificationService.cs
This commit is contained in:
Shannon
2014-01-13 19:11:39 +11:00

View File

@@ -327,6 +327,7 @@ namespace Umbraco.Core.Services
sender.Send(mail);
}
}
}
catch (Exception ex)
{