clasnake f4ba31964a Merge branch 'master' into 3006/sbt_for_java_scala ... Conflicts: samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java		2016-06-03 00:43:43 +08:00
..
src	Merge branch 'master' into 3006/sbt_for_java_scala	2016-06-03 00:43:43 +08:00
XhhGitIgnore	Revert "Revert "[Java] Add auto-generated documentation in Markdown to Java clients""	2016-04-22 10:13:54 +08:00
.gitignore	use Title attribute as model name	2016-05-14 15:30:57 -04:00
pom.xml	update pom for swagger codegen module	2016-05-25 17:25:18 +08:00