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

Implement BSIP 77: Initial collateral ratio (ICR) #2157

Merged
merged 8 commits into from May 5, 2020
Merged

Commits on Apr 23, 2020

  1. Configuration menu
    Copy the full SHA
    dd0bef7 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. Configuration menu
    Copy the full SHA
    b8c6843 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6e8ecba View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    49ea968 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4f02fcf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9963c8c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2131c68 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. Merge branch 'hardfork' into pr-bsip77-icr

    Resolved conflicts:
    - libraries/chain/asset_evaluator.cpp : applied changes from both branches
    - libraries/chain/proposal_evaluator.cpp : applied changes from both branches
    abitmore committed May 5, 2020
    Configuration menu
    Copy the full SHA
    f5d4e44 View commit details
    Browse the repository at this point in the history