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

[GRPH-50] network broadcast api fix, version 2 #67

Merged
merged 17 commits into from
Sep 23, 2019

Conversation

Noughmad
Copy link

Adapt the core to changes in PBSA/peerplays-fc#4

This is the same as #61, but against the qa_gpos_18.04 branch.

@bobinson bobinson added bug Something isn't working Changes Requested Changes Requested via review labels Aug 27, 2019
Copy link

@bobinson bobinson left a 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 Noughmad force-pushed the GRPH-50-network_broadcast_api-fix-v2 branch from f6d5f6f to b5d52d9 Compare August 28, 2019 14:45
@Noughmad Noughmad changed the base branch from qa_gpos_18.04 to develop August 28, 2019 14:45
@Noughmad
Copy link
Author

Rebased everything to develop branch.

@Noughmad Noughmad removed the Changes Requested Changes Requested via review label Aug 29, 2019
@oxarbitrage
Copy link

Probably this need to be closed and open a new one or rebased. It haves too many unrelated changes + conflicts. Thank you.

@Noughmad
Copy link
Author

I rebased and resolved the conflicts. Can this be merged before further conflicts arise?

@bobinson bobinson merged commit 857a30d into develop Sep 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants