Merge remote-tracking branch 'origin/release' into rybrande/dev

This commit is contained in:
ryanbrandenburg 2016-04-14 09:47:04 -07:00
commit b63b8d0672
1 changed files with 7 additions and 1 deletions

View File

@ -1,5 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core support for JSON PATCH.",
"tags": [
"aspnetcore",
"json",
"jsonpatch"
],
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
@ -10,7 +16,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/jsonpatch"
}, },
"dependencies": { "dependencies": {
"Newtonsoft.Json": "8.0.3" "Newtonsoft.Json": "8.0.3"