Maelig Nantel a39942f43f Merge remote-tracking branch 'refs/remotes/swagger-api/master' into fix-java-warnings ...

# Conflicts:

#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java

2016-01-18 10:10:27 +01:00

..

src

Merge remote-tracking branch 'refs/remotes/swagger-api/master' into fix-java-warnings

2016-01-18 10:10:27 +01:00

.gitignore

Ignore settings #1294

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

pom.xml

updated versions

2016-01-07 20:43:49 -08:00