Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving to Socks #22

Merged
merged 6 commits into from
Apr 14, 2016
Merged

Moving to Socks #22

merged 6 commits into from
Apr 14, 2016

Conversation

czechboy0
Copy link
Collaborator

#21

# Conflicts:
#	Sources/Redbird/ClientSocket.swift
#	Tests/Redbird/PerformanceTests.swift
#	XcodeProject/Redbird.xcodeproj/project.pbxproj
#	XcodeProject/Redbird.xcodeproj/xcshareddata/xcschemes/Redbird.xcscheme
@czechboy0 czechboy0 merged commit 3323385 into master Apr 14, 2016
@czechboy0 czechboy0 deleted the hd/socks_swift3 branch April 14, 2016 14:01
@czechboy0 czechboy0 mentioned this pull request Apr 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant