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.

Sign up for GitHub

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

Jump to bottom

Bring back all review fixes that were deleted with 50/50 merge #114

Merged
merged 4 commits into from
Sep 6, 2019
Merged

Bring back all review fixes that were deleted with 50/50 merge #114

merged 4 commits into from
Sep 6, 2019

Conversation

pbattu123
Copy link

No description provided.

@pbattu123 pbattu123 requested a review from bobinson September 4, 2019 15:17
@bobinson
Copy link

bobinson commented Sep 4, 2019

note: Some of the changes that was done on the hardfork branch is here https://gitlab.com/PBSA/peerplays/commits/hardfork

  • We need to bring the tests

@pbattu123
Copy link
Author

Unit test cases are passed, but some of them need to update to sync with master

@bobinson bobinson added the hardfork Needs hardfork label Sep 5, 2019
@pbattu123 pbattu123 merged commit 62ddd67 into master Sep 6, 2019
@bobinson bobinson added the merged label Sep 8, 2019
@bobinson bobinson mentioned this pull request Sep 10, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobinson bobinson bobinson approved these changes

Assignees
No one assigned
Labels
hardfork Needs hardfork merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pbattu123 @bobinson