Merge branch 'release' into dev

This commit is contained in:
jacalvar 2016-06-15 14:48:27 -07:00
commit 47d28b78d6
1 changed files with 1 additions and 1 deletions

View File

@ -7,7 +7,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Newtonsoft.Json": "9.0.1-beta1"
"Newtonsoft.Json": "9.0.1"
},
"buildOptions": {
"emitEntryPoint": true