Merge branch 'release' into dev

This commit is contained in:
jacalvar 2016-06-15 15:19:59 -07:00
commit 1f51f6dd2f
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication": "1.0.0-*", "Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Newtonsoft.Json": "9.0.1-beta1" "Newtonsoft.Json": "9.0.1"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},

View File

@ -22,7 +22,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication": "1.0.0-*", "Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Newtonsoft.Json": "9.0.1-beta1" "Newtonsoft.Json": "9.0.1"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},