xhh de463cf170 Merge branch 'master' into java-object-mapper-getter ...

Conflicts:
	samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java

2016-02-18 20:57:22 +08:00

..

swagger-codegen

Merge branch 'master' into java-object-mapper-getter

2016-02-18 20:57:22 +08:00

swagger-codegen-cli

Use LOGGER instead of LOG

2016-01-28 00:12:24 +08:00

swagger-codegen-maven-plugin

Fixed indentation to use spaces instead of tabs

2016-02-13 11:15:04 -05:00

swagger-generator

updated index file

2016-02-06 07:07:53 -08:00