xhh 253a955cff Merge branch 'master' into java-binary-support ...

Conflicts:
	samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
	samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
	samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java

2016-01-21 17:28:14 +08:00

..

client

Merge branch 'master' into java-binary-support

2016-01-21 17:28:14 +08:00

dynamic-html

replace tab with space, update samples

2015-11-03 21:34:44 +08:00

html

replace tab with space, update samples

2015-11-03 21:34:44 +08:00

server/petstore

make slim sh executable

2016-01-19 23:39:07 +08:00

server-generator

Swagger Spec -> OpenAPI Spec

2015-12-30 14:52:15 -08:00

yaml

url changes

2015-06-07 11:46:11 -04:00