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

[Christoph Atteneder]

ACK - see https://github.com/bisq-network/bisq-desktop/pull/1601#issuecomment-403486954

-- 
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-core/pull/136#issuecomment-403779365
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20180710/181c4542/attachment-0001.html>