Vlad Dobromyslov 7c49232f60 Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type ... # Conflicts are resolved: libraries/chain/db_maint.cpp libraries/chain/db_witness_schedule.cpp libraries/chain/include/graphene/chain/database.hpp libraries/chain/include/graphene/chain/global_property_object.hpp libraries/chain/include/graphene/chain/son_object.hpp libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp libraries/wallet/wallet.cpp		2022-04-11 11:09:45 +03:00
..
app	#319 vote id type as map	2022-03-18 21:47:19 +00:00
chain	#339 - add function get_son_schedule_id	2022-04-11 10:41:29 +03:00
db	bug #267 Fix error in chain_test in gitlab autobuild	2022-01-28 15:05:49 +00:00
egenesis	Merge Beatrice to Master (#408)	2020-12-14 19:40:27 +05:30
fc@6171e973c7	Update fc to last commit	2022-03-04 18:32:40 -04:00
net	Remove as much warnings from build log as possible (#400)	2020-12-18 14:23:37 +01:00
plugins	Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type	2022-04-11 11:09:45 +03:00
time	added missing libraries/time	2017-07-17 22:16:23 +02:00
utilities	Resolve "port ES changes from Bitshares"	2022-01-31 05:25:56 +00:00
wallet	#339 - fix son_ids in list_active_sons	2022-04-08 09:14:36 +03:00
CMakeLists.txt	Build optimizations (#403)	2020-11-12 19:38:25 +05:30