evigeant 6db358dd39 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java

2016-01-28 09:18:24 -05:00

..

swagger-codegen

Merge pull request #1988 from wing328/maven_build_quiet3

2016-01-28 11:52:35 +08:00

swagger-codegen-cli

Use LOGGER instead of LOG

2016-01-28 00:12:24 +08:00

swagger-codegen-maven-plugin

Merge remote-tracking branch 'upstream/master'

2016-01-28 09:18:24 -05:00

swagger-generator

Merge pull request #1988 from wing328/maven_build_quiet3

2016-01-28 11:52:35 +08:00