diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-04-06 21:24:36 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-04-06 21:24:36 -0700 |
| commit | 251a22031596194bb9b8b9b438f0788cf5c36036 (patch) | |
| tree | fe0a6c863609e2877e7be8661122adc067759f1f /samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs | |
| parent | 99d55efac7b70a681c710d24f66320edd1efdd91 (diff) | |
| parent | c676c0940ca93006fd3feec16a460f962aa8a350 (diff) | |
| download | DotNetOpenAuth-251a22031596194bb9b8b9b438f0788cf5c36036.zip DotNetOpenAuth-251a22031596194bb9b8b9b438f0788cf5c36036.tar.gz DotNetOpenAuth-251a22031596194bb9b8b9b438f0788cf5c36036.tar.bz2 | |
Merge branch 'v3.4' into oauth2
Conflicts:
projecttemplates/RelyingPartyLogic/OAuthAuthorizationManager.cs
samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs
Diffstat (limited to 'samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs')
| -rw-r--r-- | samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs b/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs index 50c25c8..ad188d3 100644 --- a/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs +++ b/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs @@ -76,4 +76,4 @@ return error != null ? null : result; } } -}
\ No newline at end of file +} |