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

..

java

Merge remote-tracking branch 'upstream/master' into fix-cli-options

2016-01-28 12:11:14 -05:00

resources

Merge pull request #1980 from wing328/ruby_add_test

2016-01-27 15:28:56 +08:00