xhh 44780e6e1b Merge branch 'develop_2.0' into ruby-cli-option2 ...

Conflicts:
	modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache

2015-06-09 15:44:50 +08:00

..

src

Merge branch 'develop_2.0' into ruby-cli-option2

2015-06-09 15:44:50 +08:00

pom.xml

updated versions

2015-06-09 00:25:09 -07:00