wing328 7d33e1655d Merge branch 'master' of https://github.com/swagger-api/swagger-codegen ...

Conflicts:
	samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.mustache

2016-05-07 17:55:39 +08:00

..

src

Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

2016-05-07 17:55:39 +08:00

XhhGitIgnore

Revert "Revert "[Java] Add auto-generated documentation in Markdown to Java clients""

2016-04-22 10:13:54 +08:00

.gitignore

Ignore settings #1294

2015-12-06 10:38:50 +01:00

pom.xml

Revert: #1809 changing the poms

2016-04-19 11:57:55 +02:00