diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-09 20:56:19 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-09 20:56:19 -0700 |
| commit | 21145c4c7cc2c2a8daa36862b555766a6306c552 (patch) | |
| tree | 7c417a24022479f2219dfb48fb011a6124ed58cc /doc/specs/draft-ietf-oauth.html | |
| parent | 07047811a7dfd1218de8f20393a282391e2f35cc (diff) | |
| parent | 9938982dc1ae0c2125291667262b713550a0cf8c (diff) | |
| download | DotNetOpenAuth-21145c4c7cc2c2a8daa36862b555766a6306c552.zip DotNetOpenAuth-21145c4c7cc2c2a8daa36862b555766a6306c552.tar.gz DotNetOpenAuth-21145c4c7cc2c2a8daa36862b555766a6306c552.tar.bz2 | |
Merge branch 'v3.4' into oauth2
Conflicts:
samples/OAuthConsumer/Web.config
src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
src/DotNetOpenAuth/DotNetOpenAuth.csproj
Diffstat (limited to 'doc/specs/draft-ietf-oauth.html')
0 files changed, 0 insertions, 0 deletions