clasnake f4ba31964a Merge branch 'master' into 3006/sbt_for_java_scala ...

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-03 00:43:43 +08:00

..

main

Merge branch 'master' into 3006/sbt_for_java_scala

2016-06-03 00:43:43 +08:00

test/java/io/swagger

Java: Add basic junit test templates for api clients

2016-05-16 17:55:29 -07:00