Merge branch 'master' into turnstile

This commit is contained in:
Aditya Kulkarni
2018-10-28 21:32:46 -07:00
19 changed files with 147 additions and 103 deletions

View File

@@ -14,7 +14,7 @@ public:
static const QString getTokenName();
static const QString getDevSproutAddr();
static const QString getDevAddr(Tx tx);
static const QString getDonationAddr();
static const QString getDonationAddr(bool sapling);
static double getMinerFee();
static double getDevFee();