Merge branch 'develop_2.0' of github.com:swagger-api/swagger-core into develop_2.0

fehguy · fehguy · commit 3145db4400c7 · 2015-02-23T08:42:19.000-08:00
diff --git a/samples/java-dropwizard/README.md b/samples/java-dropwizard/README.md
@@ -7,4 +7,4 @@ java -jar target/swagger-java-dropwizard-sample-app-1.5.2-M1-SNAPSHOT.jar server
 
 ```
 
-You can then access swagger at http://localhost:8080/api-docs
+You can then access swagger at http://localhost:8080/swagger.json

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ java -jar target/swagger-java-dropwizard-sample-app-1.5.2-M1-SNAPSHOT.jar server`
`7`	`7`
`8`	`8`	```
`9`	`9`
`10`		`-You can then access swagger at http://localhost:8080/api-docs`
	`10`	`+You can then access swagger at http://localhost:8080/swagger.json`