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
..
2016-04-06 14:07:52 -07:00