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

Merge 3.0.0 release to develop #1686

Merged
merged 209 commits into from
Mar 29, 2019
Merged

Merge 3.0.0 release to develop #1686

merged 209 commits into from
Mar 29, 2019

Conversation

jmjatlanta
Copy link
Contributor

This will merge 3.0.0 release code into the develop branch. Fixed conflicts in chain_parameters.hpp, tests/cli/main.cpp, and required changes in htlc_tests.cpp.

abitmore and others added 30 commits September 13, 2018 11:59
Note: this should not break compatibility in production because the result should be the same after hard fork #343.
@jmjatlanta jmjatlanta merged commit f74f450 into develop Mar 29, 2019
@jmjatlanta jmjatlanta deleted the jmj_release_develop branch March 29, 2019 15:52
@abitmore abitmore added this to the 3.1.0 - Feature Release milestone Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants