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

..

src

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

2016-02-18 20:57:22 +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