6 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	275315ee3e	gpos, graphene updates	2020-03-19 00:54:15 -03:00
sierra19XX	ed4ebfdb80	SON127 - Add son parameter extensions to genesis, push proposal fix (#310) ... * SON276 - Fix SON proposal exceptions - I * SON127 - Add son parameter extensions to genesis, push proposal fix Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>	2020-03-18 00:01:31 +11:00
pbattu123	11718af9b8	Merge develop into SONS	2020-03-03 16:42:51 -04:00
pbattu	0f06a9af2a	Required changes to upgrade blockchain to ubuntu18.04	2019-05-20 22:32:17 -03:00