xhh 7b1799f874 Merge branch 'master' into java-util-model-package ...

Conflicts:
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java

2015-10-12 17:11:43 +08:00

..

src

Merge branch 'master' into java-util-model-package

2015-10-12 17:11:43 +08:00

pom.xml

Fixed #1304: Migrate tests from the Scala to the plain Java. Part 3

2015-10-02 16:20:16 +03:00