diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-07-27 22:38:15 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-07-27 22:38:15 -0700 |
| commit | 32f052d2aa83c95e4b13dbb98ab94b875ddd25d4 (patch) | |
| tree | 371e57b88afaf38876199bcbc84b5f9a008be680 /src/DotNetOpenAuth.BuildTasks/CreateWebApplication.cs | |
| parent | c843a748845923bb1171a5bed28d37f039767005 (diff) | |
| parent | 9abf0d6c972d7e26233522ec4fc1f5cc80799202 (diff) | |
| download | DotNetOpenAuth-32f052d2aa83c95e4b13dbb98ab94b875ddd25d4.zip DotNetOpenAuth-32f052d2aa83c95e4b13dbb98ab94b875ddd25d4.tar.gz DotNetOpenAuth-32f052d2aa83c95e4b13dbb98ab94b875ddd25d4.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
src/DotNetOpenAuth/OpenId/OpenIdStrings.resx
src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponse.cs
src/version.txt
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/CreateWebApplication.cs')
0 files changed, 0 insertions, 0 deletions