openapi-generator/modules
evigeant 4335dc5d16 Merge remote-tracking branch 'upstream/master' into fix-cli-options
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-28 12:11:14 -05:00
..
swagger-codegen Merge remote-tracking branch 'upstream/master' into fix-cli-options 2016-01-28 12:11:14 -05:00
swagger-codegen-cli Use LOGGER instead of LOG 2016-01-28 00:12:24 +08:00
swagger-codegen-maven-plugin fix for #1976, added missing types 2016-01-25 21:34:28 -08:00
swagger-generator Merge pull request #1988 from wing328/maven_build_quiet3 2016-01-28 11:52:35 +08:00