Merge branch 'master' into master

This commit is contained in:
Fabian Schuh 2017-09-01 10:41:31 +02:00 committed by GitHub
commit 67281019af

View file

@ -13,7 +13,7 @@ detailed explanation.
Number | Title | Owner | Type | Status Number | Title | Owner | Type | Status
-------------------|----------------------------------------------------------|-------------------|----------------|-------- -------------------|----------------------------------------------------------|-------------------|----------------|--------
[1](bsip-0001.md) | BSIP Purpose and Guidelines | Fabian Schuh | Informational | Draft [1](bsip-0001.md) | BSIP Purpose and Guidelines | Fabian Schuh | Informational | Draft
[2](bsip-0002.md) | Refund Create Order Fees on Cancel | Daniel Larimer | Protocol | Accepted [2](bsip-0002.md) | Refund Create Order Fees on Cancel | Daniel Larimer | Protocol | Installed
[3](bsip-0003.md) | Maker / Taker Market Fees Flag | Daniel Larimer | Protocol | Deferred [3](bsip-0003.md) | Maker / Taker Market Fees Flag | Daniel Larimer | Protocol | Deferred
[4](bsip-0004.md) | Distribute Market Fees on Core Asset to Referral Program | Daniel Larimer | Protocol | Draft [4](bsip-0004.md) | Distribute Market Fees on Core Asset to Referral Program | Daniel Larimer | Protocol | Draft
[5](bsip-0005.md) | Expiring Votes for Witnesses | Daniel Larimer | Protocol | Draft [5](bsip-0005.md) | Expiring Votes for Witnesses | Daniel Larimer | Protocol | Draft
@ -29,7 +29,7 @@ Number | Title |
[15](bsip-0015.md) | Disable negative voting on workers | Daniel Larimer | Protocol | Installed [15](bsip-0015.md) | Disable negative voting on workers | Daniel Larimer | Protocol | Installed
[16](bsip-0016.md) | Optimization to Force Settlement Parameters of BitCNY | Jerry Liu | Protocol | Installed [16](bsip-0016.md) | Optimization to Force Settlement Parameters of BitCNY | Jerry Liu | Protocol | Installed
[17](bsip-0017.md) | Revive BitAsset after Global Settlement | Peter Conrad | Protocol | Draft [17](bsip-0017.md) | Revive BitAsset after Global Settlement | Peter Conrad | Protocol | Draft
[18](bsip-0018.md) | Revive BitAsset through buying Settlement Pool | Fabian Schuh | Protocol | Draft [18](bsip-0018.md) | Revive BitAsset through buying Settlement Pool | Fabian Schuh | Protocol | Accepted
[19](bsip-0019.md) | Introducing profit sharing/dividends to Bitshares (MPA only) | Customminer | Protocol | Draft [19](bsip-0019.md) | Introducing profit sharing/dividends to Bitshares (MPA only) | Customminer | Protocol | Draft
[20](bsip-0020.md) | Introducing profit sharing/dividends to Bitshares (UIA only) | Customminer | Protocol | Draft [20](bsip-0020.md) | Introducing profit sharing/dividends to Bitshares (UIA only) | Customminer | Protocol | Draft
[21](bsip-0021.md) | Introducing the 'Coin-Age' statistic to Bitshares assets | Customminer | Protocol | Draft [21](bsip-0021.md) | Introducing the 'Coin-Age' statistic to Bitshares assets | Customminer | Protocol | Draft