xhh 0e2e7838ae Merge branch 'bug-fix-ruby-file-upload' into ruby-api-client
Conflicts:
	modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
	samples/client/petstore/ruby/lib/petstore/swagger/request.rb
2015-08-20 11:24:33 +08:00
..