diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-03-17 09:03:08 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-03-17 09:03:08 -0700 |
| commit | 980693bd2183055c004b92341ac074fc1951dc73 (patch) | |
| tree | e3dbf58aa645678c4aa8948bb180a20c0ac9f558 /samples/OAuthServiceProvider/Code/DataClasses.designer.cs | |
| parent | 5513ca7174c6681848d0c05c5dc9e79a50ea5b10 (diff) | |
| parent | bb6361334b034f0f42baa147a3ff928fc84d2c5c (diff) | |
| download | DotNetOpenAuth-980693bd2183055c004b92341ac074fc1951dc73.zip DotNetOpenAuth-980693bd2183055c004b92341ac074fc1951dc73.tar.gz DotNetOpenAuth-980693bd2183055c004b92341ac074fc1951dc73.tar.bz2 | |
Merge branch 'v3.2' into v3.3
Conflicts:
src/DotNetOpenAuth/Properties/AssemblyInfo.cs
Diffstat (limited to 'samples/OAuthServiceProvider/Code/DataClasses.designer.cs')
0 files changed, 0 insertions, 0 deletions