Ole Lensmar e253fdea33 Merge branches 'develop_2.0' and 'jaxrs-server-codegen-improvements' of https://github.com/swagger-api/swagger-codegen into jaxrs-server-codegen-improvements ...

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

2015-08-23 10:26:07 -04:00

..

src

Merge branches 'develop_2.0' and 'jaxrs-server-codegen-improvements' of https://github.com/swagger-api/swagger-codegen into jaxrs-server-codegen-improvements

2015-08-23 10:26:07 -04:00

pom.xml

Update scala maven plugin and fix issues in POM configuration

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