From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Jan 2019 17:01:02 +0000 (-0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.5.9~13
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dc7d4bf2a68bd167cb5850a03105b9f4ca19f90e;p=keyringer.git

Merge branch 'develop'
---

dc7d4bf2a68bd167cb5850a03105b9f4ca19f90e