openapi-generator/samples/client/petstore/java
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
..
default Merge branch 'master' into java-binary-support 2016-01-21 17:28:14 +08:00
feign Fix tests of UserAPI 2016-01-20 12:16:38 +08:00
jersey2 Merge branch 'master' into java-binary-support 2016-01-21 17:28:14 +08:00
okhttp-gson Merge branch 'master' into java-binary-support 2016-01-21 17:28:14 +08:00
retrofit Fix tests of UserAPI 2016-01-20 12:16:38 +08:00
retrofit2 Fix tests of UserAPI 2016-01-20 12:16:38 +08:00