Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -6,8 +6,8 @@
 # Exercise the listtransactions API

 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *

+from decimal import Decimal

 def check_array_result(object_array, to_match, expected):
    """