Commit graph

8 commits

Author SHA1 Message Date
Srdjan Obucina
ba9e6e3680 Revert "Merge pull request #315 from peerplays-network/revert-312-sons_gpos_merge_mar19"
This reverts commit c2ee4f09c6, reversing
changes made to 955893bd49.
2020-03-27 06:52:10 +01:00
obucina
19a34e9102
Revert "Merge develop branch changes(GPOS+graphene updates) into SONs branch" 2020-03-21 09:47:46 +01:00
pbattu123
11718af9b8 Merge develop into SONS 2020-03-03 16:42:51 -04:00
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix
JSON fix
2019-08-28 15:42:21 +02:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
d0609e8e74 Update copyright notice for BitShares 2015-10-12 13:48:40 -04:00
theoreticalbts
60f0812de2 Update copyright notice 2015-10-12 13:32:47 -04:00
Daniel Larimer
70964b55e5 Fix #115 Claiming BTC and PTS balances 2015-06-30 18:20:12 -04:00