xhh 167e95bb3a Merge branch 'develop_2.0' into library-template-jersey2 ...

Conflicts:
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache

2015-08-07 21:18:27 +08:00

..

src

Merge branch 'develop_2.0' into library-template-jersey2

2015-08-07 21:18:27 +08:00

pom.xml

Update scala maven plugin and fix issues in POM configuration

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