From: Dessalines <tyhou13@gmx.com>
Date: Sun, 12 Jan 2020 18:48:14 +0000 (-0500)
Subject: Merge branch 'dev' into r2d2_actix_pooling
X-Git-Url: http://these/git/%22https:/image.com/%7B%7D/static/%22%7Burl%7D/%7Burl%7D?a=commitdiff_plain;h=c0136a9f340eaa08a87b25424d8014a928ceb284;p=lemmy.git

Merge branch 'dev' into r2d2_actix_pooling
---

c0136a9f340eaa08a87b25424d8014a928ceb284