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

Trivial merge