diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-18 11:27:43 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-18 11:27:43 -0800 |
| commit | 53e675d9603dc05f2b51c645ec51ae9ee29fb3c1 (patch) | |
| tree | 717188a56a26f539d09fd5d92a7df165829a30fe /src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs | |
| parent | 0090c071e62f5d283d59eaa2645974e55a0b40b3 (diff) | |
| parent | 6c2ac0fd2204d02c7a22718dce845f48f03da998 (diff) | |
| download | DotNetOpenAuth-53e675d9603dc05f2b51c645ec51ae9ee29fb3c1.zip DotNetOpenAuth-53e675d9603dc05f2b51c645ec51ae9ee29fb3c1.tar.gz DotNetOpenAuth-53e675d9603dc05f2b51c645ec51ae9ee29fb3c1.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth/Strings.Designer.cs
src/DotNetOpenAuth/Strings.resx
Diffstat (limited to 'src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs')
0 files changed, 0 insertions, 0 deletions