Merge branch 'master' of gitorious.org:electrum/electrum
Conflicts: client/electrum
This commit is contained in:
commit
350a462901
|
@ -305,7 +305,7 @@ if __name__ == '__main__':
|
|||
v = line['value']
|
||||
b += v
|
||||
try:
|
||||
time_str = datetime.datetime.fromtimestamp( line['timestamp'])
|
||||
time_str = str( datetime.datetime.fromtimestamp( line['timestamp']))
|
||||
except:
|
||||
print line['timestamp']
|
||||
time_str = 'pending'
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
ELECTRUM_VERSION = "0.43b"
|
||||
ELECTRUM_VERSION = "0.43c"
|
||||
SEED_VERSION = 4 # bump this everytime the seed generation is modified
|
||||
|
|
Loading…
Reference in New Issue