xhh 253a955cff Merge branch 'master' into java-binary-support ... Conflicts: samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java		2016-01-21 17:28:14 +08:00
..
petstore	Merge branch 'master' into java-binary-support	2016-01-21 17:28:14 +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