]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'develop'
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 9 Nov 2016 12:22:20 +0000 (10:22 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 9 Nov 2016 12:22:20 +0000 (10:22 -0200)

Trivial merge