xhh 822e640e0a Merge branch 'develop_2.0' into ruby-debug ...

Conflicts:
	modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
	modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
	samples/client/petstore/ruby/lib/petstore/swagger/request.rb
	samples/client/petstore/ruby/lib/swagger_client.rb
	samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb

2015-07-14 12:33:17 +08:00

..

petstore

Merge branch 'develop_2.0' into ruby-debug

2015-07-14 12:33:17 +08:00

petstore.rb

Merge branch 'develop_2.0' into ruby-debug

2015-07-14 12:33:17 +08:00