diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-26 20:08:56 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-26 20:08:56 -0800 |
| commit | ad0228798a1f32a5da40c2f73dd82f37f4494c45 (patch) | |
| tree | 29971d7e06a41ab6f7a40d08d4a493f13b774662 /samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs | |
| parent | 8ccb2f51d3222431cfea9defddc6a99e4c50b38b (diff) | |
| parent | 21d77c90dcf5e65a9c9c8999db119168cdc43828 (diff) | |
| download | DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.zip DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.tar.gz DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
src/DotNetOpenAuth/OpenId/ChannelElements/ReturnToNonceBindingElement.cs
Diffstat (limited to 'samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs')
0 files changed, 0 insertions, 0 deletions