Merge branch 'release' into dev

This commit is contained in:
BrennanConroy 2016-04-14 15:41:55 -07:00
commit 580cf760a4
1 changed files with 4 additions and 2 deletions

View File

@ -20,12 +20,14 @@
},
"dependencies": {
"Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Newtonsoft.Json": "8.0.3",
"System.Runtime.Serialization.Primitives": "4.1.1-*"
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Runtime.Serialization.Primitives": "4.1.1-*"
},
"imports": [
"portable-net451+win8"
]