diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-04-30 18:54:23 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-04-30 18:54:23 -0700 |
| commit | 7018fd168b8b02e2e05c16166d34d3410cc6fbe0 (patch) | |
| tree | c5aeef3a81f451efbd1caf28b667e0aaa34bc147 /src/DotNetOpenAuth.Test/AssemblyTesting.cs | |
| parent | dc5c6421e4fbc243ed3c6e2485cc1b2974ca76ec (diff) | |
| parent | ace3e8099589abfb3fcd8ebc084003f1d36f7f92 (diff) | |
| download | DotNetOpenAuth-7018fd168b8b02e2e05c16166d34d3410cc6fbe0.zip DotNetOpenAuth-7018fd168b8b02e2e05c16166d34d3410cc6fbe0.tar.gz DotNetOpenAuth-7018fd168b8b02e2e05c16166d34d3410cc6fbe0.tar.bz2 | |
Merge branch 'v3.3' into v3.4
Conflicts:
src/DotNetOpenAuth/OpenId/RelyingParty/AssociationManager.cs
Diffstat (limited to 'src/DotNetOpenAuth.Test/AssemblyTesting.cs')
0 files changed, 0 insertions, 0 deletions