xhh 8c36ed8409 Merge branch 'master' into java-imports ...

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

2016-02-22 09:24:58 +08:00

..

default

Merge branch 'master' into java-imports

2016-02-22 09:24:58 +08:00

feign

Merge branch 'master' into java-imports

2016-02-22 09:24:58 +08:00

jersey2

Merge branch 'master' into java-imports

2016-02-22 09:24:58 +08:00

okhttp-gson

Merge branch 'master' into java-imports

2016-02-22 09:24:58 +08:00

retrofit

Merge branch 'master' into java-imports

2016-01-29 11:16:14 +08:00

retrofit2

Merge branch 'master' into java-imports

2016-02-22 09:24:58 +08:00

retrofit2rx

Use retrofit2-beta3 and it's dendencies in retrofit2 clients

2016-02-02 15:43:08 +01:00