Commit graph

7 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
Ronak Patel
3510704398 Fix for for history ID mismatch ( Bitshares PR #875 ) 2019-09-09 15:33:47 +05:30
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
kstdl
fdd77ef5af minor logic changes. added db_api and cli_wallet methods 2017-12-11 17:42:55 +03:00
kstdl
342e6db610 inital 2017-05-25 12:13:59 +03:00