Merge branch 'release' into dev

This commit is contained in:
jacalvar 2016-06-15 15:12:24 -07:00
commit 5e04d95f2a
1 changed files with 1 additions and 1 deletions

View File

@ -47,7 +47,7 @@
"type": "build" "type": "build"
}, },
"Microsoft.Extensions.WebEncoders": "1.0.0-*", "Microsoft.Extensions.WebEncoders": "1.0.0-*",
"Newtonsoft.Json": "9.0.1-beta1", "Newtonsoft.Json": "9.0.1",
"System.Buffers": "4.0.0-*" "System.Buffers": "4.0.0-*"
}, },
"frameworks": { "frameworks": {