Commits
Christian Noon committed 78f155d8f84M
Merge branch 'master' into port/migrating_1.3.0_to_swift_2.0 # Conflicts: # Example/DetailViewController.swift # Example/HTTPBin.swift # Example/MasterViewController.swift # README.md # Source/Download.swift # Source/Manager.swift # Source/MultipartFormData.swift # Source/ParameterEncoding.swift # Source/Request.swift # Source/ResponseSerialization.swift # Source/Upload.swift # Tests/DownloadTests.swift # Tests/ParameterEncodingTests.swift # Tests/URLProtocolTests.swift # iOS Example.xcodeproj/project.pbxproj
