Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:48:35 -07:00
commit f6be65d69e
2 changed files with 2 additions and 9 deletions

View File

@ -24,10 +24,7 @@
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-*",
"System.Resources.ResourceManager": "4.0.1-*" "System.Resources.ResourceManager": "4.0.1-*"
}, }
"imports": [
"dotnet5.1"
]
} }
} }
} }

View File

@ -23,10 +23,6 @@
"System.Text.Encodings.Web": "4.0.0-*" "System.Text.Encodings.Web": "4.0.0-*"
}, },
"frameworks": { "frameworks": {
"netstandard1.0": { "netstandard1.0": {}
"imports": [
"dotnet5.1"
]
}
} }
} }