merge

2019-10-24 22:35:37 +02:00
parent a1a7130729 bd289466b5
commit 8e29dbc7e2
18 changed files with 588 additions and 35 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -315,7 +315,7 @@ bool Settings::removeFromhushConf(QString confLocation, QString option) {
 }

 double Settings::getMinerFee() {
-    return 0.0001;
+    return 10000;
 }

 double Settings::getZboardAmount() {