Commits
Christian Noon committed 6f903f34a17M
Merge branch 'migration_point' into port/migrating_1.3.0_to_swift_2.0 # Conflicts: # .travis.yml # Source/Alamofire.swift # Source/Download.swift # Source/Manager.swift # Source/ParameterEncoding.swift # Source/Request.swift # Source/Upload.swift # Tests/DownloadTests.swift # Tests/ParameterEncodingTests.swift # Tests/RequestTests.swift # Tests/UploadTests.swift