diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-04-30 18:52:50 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-04-30 18:52:50 -0700 |
| commit | ace3e8099589abfb3fcd8ebc084003f1d36f7f92 (patch) | |
| tree | e8cb18b0781fba45fa254b44c4617c74b56f696d /samples/OAuthServiceProvider/Code/DataClasses.designer.cs | |
| parent | c2d4ef8b4bcb590b115a201ef61deed8d730a326 (diff) | |
| parent | 393db000b380db919fa02805b4ad44832338ef0e (diff) | |
| download | DotNetOpenAuth-ace3e8099589abfb3fcd8ebc084003f1d36f7f92.zip DotNetOpenAuth-ace3e8099589abfb3fcd8ebc084003f1d36f7f92.tar.gz DotNetOpenAuth-ace3e8099589abfb3fcd8ebc084003f1d36f7f92.tar.bz2 | |
Merge branch 'v3.2' into v3.3
Conflicts:
src/DotNetOpenAuth/OpenId/IAssociationStore.cs
Diffstat (limited to 'samples/OAuthServiceProvider/Code/DataClasses.designer.cs')
0 files changed, 0 insertions, 0 deletions