Skip to content

Commit bbebfbf

Browse files
AArnottAArnott
committed
Merge branch 'master' into webpages
Conflicts: src/DotNetOpenAuth.sln
2 parents 9ffd411 + 3ed1a19 commit bbebfbf

1,302 files changed

Lines changed: 43131 additions & 37219 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Every file is bound by the following copyright and license unless explicitly
44
indicated otherwise in and/or for any individual file.
55

66

7-
Copyright (c) 2008-2009, Andrew Arnott
7+
Copyright (c) 2011, Outercurve Foundation
8+
Copyright (c) 2008-2012, Andrew Arnott
89
All rights reserved.
910

1011
Microsoft Public License (Ms-PL)

‎doc/specs/draft-ietf-oauth-v2-16.txt‎

Lines changed: 0 additions & 3080 deletions
This file was deleted.

‎doc/specs/draft-ietf-oauth-v2-23.txt‎

Lines changed: 3640 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)