Merge branch 'release' into dev

pranavkm · pranavkm · commit 0c9c8cee603d · 2016-04-08T06:49:14.000-07:00
diff --git a/src/Microsoft.AspNetCore.StaticFiles/project.json b/src/Microsoft.AspNetCore.StaticFiles/project.json
@@ -25,11 +25,7 @@
     "Microsoft.Extensions.WebEncoders": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
+    "net451": {},
+    "netstandard1.3": {}
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,7 @@`
`25`	`25`	`"Microsoft.Extensions.WebEncoders": "1.0.0-*"`
`26`	`26`	`},`
`27`	`27`	`"frameworks": {`
`28`		`- "net451": { },`
`29`		`- "netstandard1.3": {`
`30`		`- "imports": [`
`31`		`- "dotnet5.4"`
`32`		`- ]`
`33`		`- }`
	`28`	`+ "net451": {},`
	`29`	`+ "netstandard1.3": {}`
`34`	`30`	`}`
`35`	`31`	`}`