Vlad Dobromyslov 87e214ff22 Merge branch 'feature/260-voting-info' into feature/270-funtions-unified-form ... Conflicts are fixed in: libraries/app/database_api.cpp libraries/app/include/graphene/app/database_api.hpp		2022-02-08 11:10:06 +03:00
..
app	Merge branch 'feature/260-voting-info' into feature/270-funtions-unified-form	2022-02-08 11:10:06 +03:00
chain	Merge branch 'develop' into feature/260-voting-info	2022-02-08 11:05:28 +03:00
db	bug #267 Fix error in chain_test in gitlab autobuild	2022-01-28 15:05:49 +00:00
egenesis	Build optimizations (#403)	2020-11-12 19:38:25 +05:30
fc@4888839219	Merge Beatrice changes to Main net	2021-07-26 20:16:24 +00:00
net	Remove as much warnings from build log as possible (#400)	2020-12-18 14:23:37 +01:00
plugins	Merge branch 'bug/245-exception-in-witness' into 'develop'	2022-01-31 14:14:25 +00:00
time	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
utilities	Resolve "port ES changes from Bitshares"	2022-01-31 05:25:56 +00:00
wallet	#270 get_worker_count(), lookup_worker_accounts() and list_workers() functions	2022-02-08 08:47:10 +03:00
CMakeLists.txt	Build optimizations (#403)	2020-11-12 19:38:25 +05:30