From: Dessalines <tyhou13@gmx.com>
Date: Sat, 20 Jul 2019 02:39:06 +0000 (-0700)
Subject: Merge branch 'upgrade-actor-web-1.0.x' of https://github.com/Jonnnh/lemmy into Jonnnh... 
X-Git-Url: http://these/git/%7B%27/docs/%7BfrontRss%7D?a=commitdiff_plain;h=a6407c92be8f3b0df71cd559a5df5714c81d1c3e;p=lemmy.git

Merge branch 'upgrade-actor-web-1.0.x' of https://github.com/Jonnnh/lemmy into Jonnnh-upgrade-actor-web-1.0.x
---

a6407c92be8f3b0df71cd559a5df5714c81d1c3e