This repository has been archived by the owner on May 21, 2021. It is now read-only.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is as far as I got, looks like we need to wire up the
|
Uhh let's not do this, can't we just cherry pick the social-nft stuff into this branch? |
We can try, there's quite a few commits to master in addition to that. Totally open to other ideas here though |
imho, do so is simpler:
so it will be less diff v3...master |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is an attempt to rebase master against v3 so that v3 can eventually be merged into master. Since there were recent features added to both
v3
andmaster
, please pay particular attention tosocial-nfts
andsocial-bridge
while reviewing.Sorry that it's such a massive PR :(