Kristof Vrolijkx 9070f1a0af Merge branches 'feature/integration-test' and 'master' of https://github.com/Vrolijkx/swagger-codegen ...

# Conflicts:
#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java

2016-05-19 20:05:55 +02:00

..

src

Merge branches 'feature/integration-test' and 'master' of https://github.com/Vrolijkx/swagger-codegen

2016-05-19 20:05:55 +02: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

Merge branches 'feature/integration-test' and 'master' of https://github.com/Vrolijkx/swagger-codegen into feature/integration-test

2016-05-11 21:59:16 +02:00