diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-08 10:01:06 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-08 10:01:06 -0700 |
| commit | 35e747c25dd0bf44f022faa816ec1ed5a6c3e4e4 (patch) | |
| tree | c05c82f5e26ab096f9fc660febaf00c7b69bd9c0 /src | |
| parent | 35f4597e47ba41d86a30296b9087355b2cfa6f26 (diff) | |
| parent | d06c16d1ff1efca45de59b76673d22587bb93649 (diff) | |
| download | DotNetOpenAuth-35e747c25dd0bf44f022faa816ec1ed5a6c3e4e4.zip DotNetOpenAuth-35e747c25dd0bf44f022faa816ec1ed5a6c3e4e4.tar.gz DotNetOpenAuth-35e747c25dd0bf44f022faa816ec1ed5a6c3e4e4.tar.bz2 | |
Merge branch 'v4.0'
Conflicts:
src/version.txt
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/version.txt b/src/version.txt index eef7c80..684edf4 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1,3 +1,3 @@ 4.1.0 -0.23.0-draft3 +0.25.0-draft1 |