Merge branch 'master' into dev

IdentityServer · Jan 17, 2016 · 59b6f46 · 59b6f46
2 parents 2e223fc + d6f4234
commit 59b6f46
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/default.ps1 b/default.ps1
@@ -11,7 +11,7 @@ properties {
 	$nuget_path = "$src_directory\.nuget\nuget.exe"
 
 	$buildNumber = 0;
-	$version = "2.0.4.0"
+	$version = "2.0.5.0"
 	$preRelease = $null
 }
 

diff --git a/source/VersionAssemblyInfo.cs b/source/VersionAssemblyInfo.cs