Code

Fix incentive for committee#1884

Code

Merged

shargon merged 11 commits intoneo-project:masterneo-project/neo:masterfrom Tommo-L:fix_incentive_for_committeeTommo-L/neo:fix_incentive_for_committeeCopy head branch name to clipboardSep 6, 2020

+19-15

Commits

Commits on Aug 28, 2020

• fix incentive for committee

  

  Tommo-L

  committed
  885333d

  Copy full SHA for 885333d

Commits on Aug 30, 2020

• Merge branch 'master' into fix_incentive_for_committee

  shargon

  authored
  d2045f8

  Copy full SHA for d2045f8

Commits on Sep 3, 2020

• Merge branch 'master' into fix_incentive_for_committee

  erikzhang

  authored
  bd63b31

  Copy full SHA for bd63b31

• Merge remote-tracking branch 'upstream/master' into fix_incentive_for_committee

  

  Tommo-L

  committed
  609644e

  Copy full SHA for 609644e

• fix

  

  Tommo-L

  committed
  c62deee

  Copy full SHA for c62deee

• Merge branch 'fix_incentive_for_committee' of https://github.com/Tommo-L/neo into fix_incentive_for_committee

  

  Tommo-L

  committed
  c36023c

  Copy full SHA for c36023c

• Update Blockchain.cs

  erikzhang

  committed
  a8b3f54

  Copy full SHA for a8b3f54

• Update NeoToken.cs

  erikzhang

  committed
  d234d13

  Copy full SHA for d234d13

• fix ut

  

  Tommo-L

  committed
  a13ba75

  Copy full SHA for a13ba75

Commits on Sep 6, 2020

• Merge branch 'master' into fix_incentive_for_committee

  shargon

  authored
  a54f920

  Copy full SHA for a54f920

• Merge branch 'master' into fix_incentive_for_committee

  shargon

  authored
  fd5bbd4

  Copy full SHA for fd5bbd4