diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-27 07:05:51 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-27 07:05:51 -0800 |
| commit | cf48d319968262e3c7f7322ea17fedcd3819d743 (patch) | |
| tree | dcc71264953aaf07b62aae065c4aff6d10a83a16 /samples/OpenIdProviderMvc/Scripts/MicrosoftMvcAjax.debug.js | |
| parent | a3538a47a43eb00461f68fb542097871f732429a (diff) | |
| parent | 505a4ae9f092e8092cc7d3b142b05614fda318f2 (diff) | |
| download | DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.zip DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.tar.gz DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.tar.bz2 | |
Merge branch 'v3.3'
Conflicts:
samples/InfoCardRelyingParty/Site.Master
samples/OpenIdProviderWebForms/Site.Master
samples/OpenIdRelyingPartyClassicAsp/MembersOnly.asp
samples/OpenIdRelyingPartyClassicAsp/default.asp
samples/OpenIdRelyingPartyClassicAsp/login.asp
samples/OpenIdRelyingPartyWebForms/Site.Master
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
Diffstat (limited to 'samples/OpenIdProviderMvc/Scripts/MicrosoftMvcAjax.debug.js')
0 files changed, 0 insertions, 0 deletions