wing328 a31f78b454 Merge branch 'swift/enums' of https://github.com/jaz-ah/swagger-codegen into jaz-ah-swift/enums ...

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

2016-05-19 16:10:47 +08:00

..

main

Merge branch 'swift/enums' of https://github.com/jaz-ah/swagger-codegen into jaz-ah-swift/enums

2016-05-19 16:10:47 +08:00

test

Merge pull request #2882 from Vrolijkx/feature/integration-test

2016-05-19 14:37:30 +08:00