wing328 bc42d941ec Merge branch 'patch-1' of https://github.com/karussell/swagger-codegen into karussell-patch-1 ...

Conflicts:
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java

2016-06-09 17:06:50 +08:00

..

client/petstore

Merge branch 'patch-1' of https://github.com/karussell/swagger-codegen into karussell-patch-1

2016-06-09 17:06:50 +08:00

dynamic-html

add new fles

2016-04-16 18:19:23 +08:00

html

update sample for html, flash

2016-04-16 17:51:12 +08:00

server/petstore

Merge pull request #3039 from cbornet/spring_interface

2016-06-09 01:38:17 +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