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

..

akka-scala

rollback akkascala to another commit (637ee77d66)

2015-06-09 13:13:56 +08:00

android-java

rollback android template

2015-06-09 13:02:54 +08:00

asyncscala

rollback asyncscala template

2015-06-09 13:03:29 +08:00

codegen

rollback codegen template

2015-06-09 13:04:03 +08:00

csharp

fix csharp refer to apiinvoker

2015-06-09 13:52:01 +08:00

flash

rollback flash apiinvoker based on 8ee8eddcff

2015-06-09 13:33:30 +08:00

Groovy

rollback grovvy template

2015-06-09 13:07:45 +08:00

htmlDocs

rollback nodejs and htmldocs template

2015-06-09 12:51:52 +08:00

Java

rollback java template

2015-06-09 13:08:32 +08:00

JavaJaxRS

rollback java jxrs template

2015-06-09 13:11:16 +08:00

JavaSpringMVC

rollback java spring mvc template

2015-06-09 13:15:03 +08:00

META-INF/services

repackaged

2015-06-06 23:44:20 -07:00

nodejs

rollback nodejs and htmldocs template

2015-06-09 12:51:52 +08:00

objc

rollback objc templates

2015-06-09 12:53:33 +08:00

perl

rollback perl template

2015-06-09 12:34:38 +08:00

php

rollback php template

2015-06-09 12:37:30 +08:00

python

rollback python template

2015-06-09 12:22:59 +08:00

python3

rollback python3 template

2015-06-09 12:40:45 +08:00

qt5cpp

roll back qt5cpp template

2015-06-09 12:42:07 +08:00

retrofit

rollback retroit template

2015-06-09 12:54:48 +08:00

ruby

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

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

scala

rollback scala template

2015-06-09 12:56:26 +08:00

scalatra

rollback scalatra template

2015-06-09 12:57:31 +08:00

swagger

added yaml generator

2015-03-18 23:24:47 -07:00

swagger-static

rollback swagger-static template

2015-06-09 12:58:41 +08:00

swift

rollback swift template

2015-06-09 13:00:13 +08:00

tizen

rollback tizen template

2015-06-09 13:00:42 +08:00

validator

rollback validator template

2015-06-09 13:01:11 +08:00

logback.xml

Code reformatting

2015-06-07 11:56:08 -04:00