diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-18 11:42:34 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-18 11:42:34 -0800 |
| commit | 4728b81b32252207b20abd21b3b2f8e969b63b61 (patch) | |
| tree | 517efa244d2df2294cd9025f293816f9fbc68b96 /src/DotNetOpenAuth.BuildTasks/CreateWebApplication.cs | |
| parent | 6d448bcb6a7e6f5f4feebbf1abebc264577d2938 (diff) | |
| parent | 53e675d9603dc05f2b51c645ec51ae9ee29fb3c1 (diff) | |
| download | DotNetOpenAuth-4728b81b32252207b20abd21b3b2f8e969b63b61.zip DotNetOpenAuth-4728b81b32252207b20abd21b3b2f8e969b63b61.tar.gz DotNetOpenAuth-4728b81b32252207b20abd21b3b2f8e969b63b61.tar.bz2 | |
Merge branch 'v3.2' into v3.3
Conflicts:
src/DotNetOpenAuth/OAuth/ServiceProvider.cs
src/DotNetOpenAuth/OpenId/Association.cs
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/CreateWebApplication.cs')
0 files changed, 0 insertions, 0 deletions