Robin Eggenkamp 28030cba19 Merge branch 'master' into swift-2.0 ...

Conflicts:
	modules/swagger-codegen/src/main/resources/swift/APIs.mustache
	modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
	modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
	modules/swagger-codegen/src/main/resources/swift/Models.mustache
	modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
	modules/swagger-codegen/src/main/resources/swift/api.mustache

2015-08-31 14:41:41 +02:00

..

src

Merge branch 'master' into swift-2.0

2015-08-31 14:41:41 +02:00

pom.xml

undo some of the debugging changes I made

2015-08-27 09:11:49 -07:00