xhh 0ef4702aa8 Merge branch 'develop_2.0' into retrofit-form-field-naming ...

Conflicts:
	samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java

2015-07-30 16:40:43 +08:00

..

src

Merge branch 'develop_2.0' into retrofit-form-field-naming

2015-07-30 16:40:43 +08:00

pom.xml

Update scala maven plugin and fix issues in POM configuration

2015-07-29 15:15:12 +02:00