forked from PBSA/peerplays
-
Notifications
You must be signed in to change notification settings - Fork 18
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
[GRPH-50] network broadcast api fix, version 2 #67
Merged
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
bobinson
added
bug
Something isn't working
Changes Requested
Changes Requested via review
labels
Aug 27, 2019
bobinson
requested changes
Aug 27, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rebase to develop
Noughmad
force-pushed
the
GRPH-50-network_broadcast_api-fix-v2
branch
from
August 28, 2019 14:45
f6d5f6f
to
b5d52d9
Compare
Rebased everything to |
Probably this need to be closed and open a new one or rebased. It haves too many unrelated changes + conflicts. Thank you. |
I rebased and resolved the conflicts. Can this be merged before further conflicts arise? |
bobinson
approved these changes
Sep 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adapt the core to changes in PBSA/peerplays-fc#4
This is the same as #61, but against the qa_gpos_18.04 branch.