]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'develop'
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 3 Nov 2017 12:55:26 +0000 (10:55 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 3 Nov 2017 12:55:26 +0000 (10:55 -0200)

Trivial merge