Files
openapi-generator/modules/swagger-codegen/src/main/java/io/swagger
xhh 71a133dafe Merge remote-tracking branch 'origin/master' into ruby-nested-model-ref
Conflicts:
	samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
	samples/client/petstore/ruby/lib/petstore/api/store_api.rb
	samples/client/petstore/ruby/lib/petstore/configuration.rb
2016-02-18 21:13:37 +08:00
..