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

..

src

Merge remote-tracking branch 'origin/master' into ruby-nested-model-ref

2016-02-18 21:13:37 +08:00

.gitignore

Ignore settings #1294

2015-12-06 10:38:50 +01:00

pom.xml

New fix

2016-01-18 11:16:04 +01:00