David Kiss 538ccb3f12 Merge remote-tracking branch 'xhh2/davidkiss-master' ... Conflicts: samples/client/petstore/java/feign/README.md samples/client/petstore/java/feign/build.gradle samples/client/petstore/java/feign/pom.xml samples/client/petstore/java/feign/settings.gradle samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java		2015-12-07 21:29:14 -05:00
..
petstore	Merge remote-tracking branch 'xhh2/davidkiss-master'	2015-12-07 21:29:14 -05:00
wordnik	updated to dev version	2015-10-25 20:59:52 -07: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