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

Conflicts:
	samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj

2016-05-21 16:24:20 +08:00

..

main

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

2016-05-21 16:24:20 +08:00

test

Replaced {{mediaType}} with {{{mediaType}} to keep the original media

2016-05-20 17:48:47 +08:00