diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-06-19 17:27:18 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-06-19 17:27:18 -0700 |
| commit | 82c34d3f7e46f113b1c13145da0c388d9c328215 (patch) | |
| tree | 18312208d8d0b08f3aa055a573116c33a268bd37 /samples/OAuthServiceProvider/App_Code/Global.cs | |
| parent | c071c9469d444ba356840b4ae0bc07b617147480 (diff) | |
| parent | 42ec238847675f5943468fc6fc22b0e0bbf43f1c (diff) | |
| download | DotNetOpenAuth-82c34d3f7e46f113b1c13145da0c388d9c328215.zip DotNetOpenAuth-82c34d3f7e46f113b1c13145da0c388d9c328215.tar.gz DotNetOpenAuth-82c34d3f7e46f113b1c13145da0c388d9c328215.tar.bz2 | |
Merge branch 'v3.0' into v3.1
Conflicts:
src/DotNetOpenAuth.sln
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/OAuth/ConsumerBase.cs
src/DotNetOpenAuth/OAuth/OAuthStrings.Designer.cs
src/DotNetOpenAuth/OAuth/OAuthStrings.resx
src/DotNetOpenAuth/Yadis/Yadis.cs
Diffstat (limited to 'samples/OAuthServiceProvider/App_Code/Global.cs')
0 files changed, 0 insertions, 0 deletions