xhh
|
f10d4c8e23
|
Merge branch 'master' into java-docs
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
samples/client/petstore/java/default/pom.xml
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
|
2016-04-19 20:19:10 +08:00 |
|