]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Merge branch 'develop'
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 31 May 2017 22:20:50 +0000 (19:20 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 31 May 2017 22:20:50 +0000 (19:20 -0300)

Trivial merge