Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-18 17:02:49 -07:00
commit 4ab5b3b76b
2 changed files with 2 additions and 0 deletions

View File

@ -1,6 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"CorsMiddlewareWebSite": "1.0.0-*",
"Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*",

View File

@ -3,6 +3,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"