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

..

swagger-codegen

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

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

swagger-codegen-cli

fix java warnings

2016-01-15 14:02:55 +01:00

swagger-codegen-maven-plugin

fix java warnings

2016-01-15 14:02:55 +01:00

swagger-generator

fix java warnings

2016-01-15 14:02:55 +01:00