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

Added P2P-CDN #1125

Merged
merged 6 commits into from May 23, 2017
Merged

Added P2P-CDN #1125

merged 6 commits into from May 23, 2017

Conversation

@andreapaiola
Copy link
Contributor

andreapaiola commented May 14, 2017

No description provided.

@DiegoRBaquero

This comment has been minimized.

Copy link
Member

DiegoRBaquero commented May 15, 2017

Hello @andreapaiola , please rebase the changes done in webtorrent master to your repository first so there are no conflicts.

andreapaiola and others added 3 commits May 14, 2017
Conflicts:
	docs/faq.md
andreapaiola
@andreapaiola

This comment has been minimized.

Copy link
Contributor Author

andreapaiola commented May 20, 2017

ok

Copy link
Member

DiegoRBaquero left a comment

All good

@DiegoRBaquero DiegoRBaquero merged commit 0774a2c into webtorrent:master May 23, 2017
1 of 3 checks passed
1 of 3 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Node Security No known vulnerabilities found
Details
@lock lock bot locked as resolved and limited conversation to collaborators May 9, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.