Skip to content

Remove libp2p items from ROADMAP-TO-1.0.0.md#334

Merged
daviddias merged 3 commits intomasterfrom
unknown repository
Oct 12, 2018
Merged

Remove libp2p items from ROADMAP-TO-1.0.0.md#334
daviddias merged 3 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jul 2, 2018

This PR removes the libp2p section from ROADMAP-TO-1.0.0.md so it can instead live in libp2p/libp2p. per libp2p/libp2p#39

@ghost ghost self-assigned this Jul 2, 2018
@ghost ghost added the in progress label Jul 2, 2018
@daviddias
Copy link
Copy Markdown
Member

@mgoelzer can you resolve the merge conflicts please?

@ghost ghost assigned daviddias Aug 12, 2018
@ghost ghost changed the title *DO NOT MERGE* Remove libp2p items from ROADMAP-TO-1.0.0.md Remove libp2p items from ROADMAP-TO-1.0.0.md Aug 13, 2018
@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 13, 2018

@diasdavid Fixed the merge conflicts. I'll get the PR in the libp2p/libp2p repo beautified soon, but in the meantime this one should not be blocked on it, so I removed that from the title and initial comment.

@daviddias daviddias merged commit da63695 into ipfs:master Oct 12, 2018
@ghost ghost removed the in progress label Oct 12, 2018
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.

1 participant