diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2009-03-31 07:44:49 -0700 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-03-31 07:44:49 -0700 |
commit | 579f013342e207c8193b766041b97f882018d8a0 (patch) | |
tree | 9e79a3e1cfbfc40bfd29120eb291367cf9411c69 /src/DotNetOpenId.Test/Extensions/ExtensionTestBase.cs | |
parent | 4cdacafc868da71308032e0de68eff8c5a5b042d (diff) | |
parent | 50721e0b5e6175fe6a2f9aae857542bba95172fd (diff) | |
download | DotNetOpenAuth-579f013342e207c8193b766041b97f882018d8a0.zip DotNetOpenAuth-579f013342e207c8193b766041b97f882018d8a0.tar.gz DotNetOpenAuth-579f013342e207c8193b766041b97f882018d8a0.tar.bz2 |
Merge branch 'v2.5' into v2.6
Conflicts:
src/DotNetOpenId/RelyingParty/OpenIdAjaxTextBox.cs
Diffstat (limited to 'src/DotNetOpenId.Test/Extensions/ExtensionTestBase.cs')
0 files changed, 0 insertions, 0 deletions