Merge branch 'develop' of https://github.com/chkr1011/MQTTnet into develop

This commit is contained in:
Christian Kratky
2017-12-07 20:37:49 +01:00
2 changed files with 3 additions and 3 deletions
@@ -130,7 +130,7 @@ namespace MQTTnet.Implementations
foreach (var certificate in options.TlsOptions.Certificates)
{
certificates.Add(new X509Certificate(certificate));
certificates.Add(new X509Certificate2(certificate));
}
return certificates;
@@ -152,4 +152,4 @@ namespace MQTTnet.Implementations
}
}
#endif
#endif