Nathan Hourt 406cc54299 Ref #381: Fix bad merge ... During merge conflict resolution, I accidentally broke custom authorities. This fixes it.		2020-09-03 17:16:06 -05:00
..
app	Peerplays Marketplace + NFT (#367)	2020-08-10 23:18:47 +10:00
chain	Ref #381: Fix bad merge	2020-09-03 17:16:06 -05:00
db	Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2	2019-09-21 17:17:19 +02:00
egenesis	Externalize serialization of blocks, tx, ops	2019-11-29 14:10:40 +03:00
fc@a76b9ff81c	sync fc branch(build optimization changes)	2020-02-24 11:13:19 -04:00
net	Merge pull request #228 from peerplays-network/feature/GRPH-162	2020-02-13 08:59:20 -04:00
plugins	Resolve #210: [HF] Check authorities on custom_operation	2020-09-02 13:14:11 -05:00
time	added missing libraries/time	2017-07-17 22:16:23 +02:00
utilities	Merge pull request #1201 from oxarbitrage/elasticsearch_tests2	2019-12-31 00:03:25 +03:00
wallet	Peerplays Marketplace + NFT (#367)	2020-08-10 23:18:47 +10:00
CMakeLists.txt	Required changes to upgrade blockchain to ubuntu18.04	2019-05-20 22:32:17 -03:00