Merge branch 'alexvandesande-ui' into develop

This commit is contained in:
obscuren 2015-02-17 16:18:40 +01:00
commit 5238b9439e

@ -888,7 +888,7 @@ ApplicationWindow {
function addPeer(peer) { peerModel.append(peer) } function addPeer(peer) { peerModel.append(peer) }
function setPeerCounters(text) { function setPeerCounters(text) {
peerCounterLabel.text = text //peerCounterLabel.text = text
} }
function timeAgo(unixTs){ function timeAgo(unixTs){