Merge branches 'guidelines' and 'master' of https://github.com/swagger-api/swagger-spec into guidelines

Ole Lensmar · Ole Lensmar · commit 61ee45422670 · 2015-05-20T09:44:55.000-06:00
diff --git a/guidelines/sample-server/package.json b/guidelines/sample-server/package.json
@@ -7,6 +7,6 @@
   },
   "dependencies": {
     "cors": "^2.5.3",
-    "http-server"   :  "https://github.com/leeroybrun/node-http-server/tarball/master"
+    "http-server":  "0.8.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"cors": "^2.5.3",`
`10`		`- "http-server" : "https://github.com/leeroybrun/node-http-server/tarball/master"`
	`10`	`+ "http-server": "0.8.0"`
`11`	`11`	`}`
`12`	`12`	`}`