xhh 4d25d264c4 Merge remote-tracking branch 'origin/develop_2.0' into java-auth ...

Conflicts:
	modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java

2015-05-29 10:08:50 +08:00

..

petstore

Merge remote-tracking branch 'origin/develop_2.0' into java-auth

2015-05-29 10:08:50 +08:00

wordnik

merged

2015-05-20 21:41:17 -07:00

wordnik-api/scala/src/test/scala

Merge branch 'develop_2.0'

2015-02-16 21:01:17 -08:00

wordnik-api-objc

removed old samples

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

wordnik-api-php

variable type fixes

2014-12-24 15:00:10 -08:00