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

Backmerge release -> develop #1486

Merged
merged 12 commits into from
Dec 21, 2018
Merged

Backmerge release -> develop #1486

merged 12 commits into from
Dec 21, 2018

Conversation

pmconrad
Copy link
Contributor

...after resolving conflicts.

oxarbitrage
oxarbitrage approved these changes Dec 21, 2018
View reviewed changes
Copy link
Member

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you.

@pmconrad pmconrad merged commit 205dc88 into bitshares:develop Dec 21, 2018
@pmconrad pmconrad deleted the resolve_conflicts branch December 21, 2018 13:12
@abitmore abitmore added this to the Hotfix-201812-1 milestone Mar 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oxarbitrage oxarbitrage oxarbitrage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Hotfix-201812-1
Development

Successfully merging this pull request may close these issues.
3 participants
@pmconrad @oxarbitrage @abitmore