Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2017-08-17 11:07:11 +02:00
commit 7ed79011fe

View File

@ -41,6 +41,7 @@ import json
import copy import copy
import re import re
import stat import stat
import errno
from functools import partial from functools import partial
from collections import namedtuple, defaultdict from collections import namedtuple, defaultdict