[bisq-network/bisq-desktop] Sync up with changes from voting branch (#1601)

[Christoph Atteneder]

ACK - checked out all branches locally and did a test trade. Everything working so far for me.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq-desktop/pull/1601#issuecomment-403486954
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20180709/ecce6f1e/attachment.html>