From: kaniini <nenolod@gmail.com>
Date: Wed, 22 May 2019 18:57:34 +0000 (+0000)
Subject: Merge branch 'ssh-fixes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f0516d911437527891f19f0936fb558e817a75ac;p=akkoma

Merge branch 'ssh-fixes' into 'develop'

Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
---

f0516d911437527891f19f0936fb558e817a75ac