evigeant 5867608ee1 Merge branch 'master' into feature/jaxrs-no-sys-property ...

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java

2016-01-03 08:18:31 -05:00

..

src

Merge branch 'master' into feature/jaxrs-no-sys-property

2016-01-03 08:18:31 -05:00

.gitignore

Ignore settings #1294

2015-12-06 10:38:50 +01:00

pom.xml

reverting changes to swagger-codegen pom.xml

2015-11-30 10:41:44 -05:00