Merge branch 'release' into dev

This commit is contained in:
BrennanConroy 2016-04-14 13:52:53 -07:00
commit 5bca59a8bd
1 changed files with 2 additions and 1 deletions

View File

@ -20,7 +20,8 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication": "1.0.0-*", "Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Newtonsoft.Json": "8.0.3" "Newtonsoft.Json": "8.0.3",
"System.Runtime.Serialization.Primitives": "4.1.1-*"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},