]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'develop'
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Nov 2016 13:33:29 +0000 (11:33 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Nov 2016 13:33:29 +0000 (11:33 -0200)

Trivial merge