Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-05-02 18:14:29 -07:00
commit 3207918e1b
1 changed files with 2 additions and 2 deletions

View File

@ -1,12 +1,12 @@
{
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*",
"Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
"xunit": "2.1.0"
},
"testRunner": "xunit",
"frameworks": {