From: Dessalines <tyhou13@gmx.com>
Date: Sat, 20 Jul 2019 03:01:10 +0000 (-0700)
Subject: Merge branch 'Jonnnh-upgrade-actor-web-1.0.x' into dev
X-Git-Url: http://these/git/?a=commitdiff_plain;h=c29f1e01f17be4ba7921b2c2f81e46011caace88;p=lemmy.git

Merge branch 'Jonnnh-upgrade-actor-web-1.0.x' into dev
---

c29f1e01f17be4ba7921b2c2f81e46011caace88