Commit graph

5 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
1d66b859c9 update GPOS HF to fall in before SONS HF, remove check 2020-03-18 17:18:15 -03:00
pbattu123
8a90e70f12 update GPOS hardfork date to sons branch 2020-03-16 22:40:35 -03:00
pbattu123
11718af9b8 Merge develop into SONS 2020-03-03 16:42:51 -04:00