Merge branch 'release' into dev

davidfowl · davidfowl · commit 9861d4cfaf28 · 2014-10-31T02:31:34.000-07:00
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json
@@ -1,5 +1,6 @@
 {
     "version": "1.0.0-*",
+    "description": "ASP.NET 5 static files middleware.",
     "dependencies": {
         "Microsoft.AspNet.FileSystems": "1.0.0-*",
         "Microsoft.AspNet.Http": "1.0.0-*",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 static files middleware.",`
`3`	`4`	`"dependencies": {`
`4`	`5`	`"Microsoft.AspNet.FileSystems": "1.0.0-*",`
`5`	`6`	`"Microsoft.AspNet.Http": "1.0.0-*",`