git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9adc0b1
fdeb0fd
)
Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into...
author
ThomasV
<thomasv@gitorious>
Thu, 1 Dec 2011 16:41:56 +0000 (19:41 +0300)
committer
ThomasV
<thomasv@gitorious>
Thu, 1 Dec 2011 16:41:56 +0000 (19:41 +0300)
1
2
server.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
server.py
Simple merge
git://git.novaco.in / electrum-server.git / commitdiff