From: Dessalines <tyhou13@gmx.com>
Date: Sun, 12 Jan 2020 00:19:38 +0000 (-0500)
Subject: Merge branch 'actix-2.0' into dev
X-Git-Url: http://these/git/%7B%60%24%7BarchiveUrl%7D/static/%24%7BappleTouchIcon%7D?a=commitdiff_plain;h=f3dbedb5c5a4b399fe0a3c83db4d1c38993b66eb;p=lemmy.git

Merge branch 'actix-2.0' into dev
---

f3dbedb5c5a4b399fe0a3c83db4d1c38993b66eb