Merge branch 'beta' into dev

2018-04-17 23:58:53 +03:00
parent 8664be3a58 958190997f
commit ddd8e4744f
10 changed files with 28 additions and 30 deletions
--- a/src/rpcclient.cpp
+++ b/src/rpcclient.cpp
@@ -135,7 +135,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
    { "paxpending", 0 },
    { "notaries", 2 },
    { "height_MoM", 1 },
-    //{ "MoMoMdata", 3 },
+    { "MoMoMdata", 3 },
    { "allMoMs", 2 },
    { "txMoMproof", 1 },
    { "minerids", 1 },