git://git.novaco.in / electrum-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40b0ae0 1886a12)
Merge remote-tracking branch 'upstream/master'
authorOvidiu Constantin <ovidiu.constantin@livigent.com>
Wed, 23 Nov 2011 14:21:29 +0000 (16:21 +0200)
committerOvidiu Constantin <ovidiu.constantin@livigent.com>
Wed, 23 Nov 2011 14:21:29 +0000 (16:21 +0200)
1  2 
server.py patch | diff1 | diff2 | blob | history

diff --cc server.py
Simple merge
Electrum server