merge with upstream repo

TerribleDev · Jan 18, 2018 · ee3a414 · ee3a414
2 parents 7c5ab7a + 29be30b
commit ee3a414
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Rakefile.rb b/Rakefile.rb
@@ -15,7 +15,7 @@
 TOOLS = File.expand_path("tools")
 NUGET = File.expand_path("#{TOOLS}/nuget")
 NUGET_EXE = File.expand_path("#{TOOLS}/nuget/nuget.exe")
-@version = "2.18.0"
+@version = "2.19.0"
 PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }
 
 desc 'Retrieve things'

diff --git a/src/Owin.Security.Providers.Salesforce/SalesforceAuthenticationHandler.cs b/src/Owin.Security.Providers.Salesforce/SalesforceAuthenticationHandler.cs
@@ -272,7 +272,7 @@ private string ComposeAuthorizationEndpoint(AuthenticationProperties properties)
 
             // if AuthenticationProperties for this session specifies an environment property
             // it should take precedence over the value in AuthenticationOptions
-            string environmentProperty = null; ;
+            string environmentProperty = null;
             if (properties.Dictionary.TryGetValue(Constants.EnvironmentAuthenticationProperty, out environmentProperty)) {
                 endpoint =
                     environmentProperty == Constants.SandboxEnvironment ?