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

..

petstore

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

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

wordnik

updated versions

2016-01-06 09:47:32 -08:00

wordnik-api/scala/src/test/scala

Code reformatting

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

wordnik-api-objc

removed old samples

2015-02-06 05:52:57 -08:00

wordnik-api-php

Code reformatting

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