diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-12-23 13:09:32 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-12-23 13:09:32 -0800 |
| commit | 45775797c5f50dc56370c75c3244ea0e83ab4832 (patch) | |
| tree | 92b067e463370751e7c35ad626062b9d641842fc /src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs | |
| parent | 5c38b4c0564f75a845678005c474df2073113ce7 (diff) | |
| parent | 1b87e9b8d74afe71b70d842ee435523e7f1aad46 (diff) | |
| download | DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.zip DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.tar.gz DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.tar.bz2 | |
Merge branch 'v3.4' into oauth2
Conflicts:
samples/OAuthServiceProvider/Code/DatabaseTokenManager.cs
samples/OAuthServiceProvider/Code/OAuthToken.cs
src/DotNetOpenAuth/Messaging/MessagingStrings.resx
Diffstat (limited to 'src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs')
0 files changed, 0 insertions, 0 deletions