From: Dessalines <tyhou13@gmx.com>
Date: Tue, 14 Jan 2020 17:18:30 +0000 (-0500)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%24%7Bsrc%7D?a=commitdiff_plain;h=2fae761e662141e3fac4fa88f0ba418c25182005;p=lemmy.git

Merge branch 'dev'
---

2fae761e662141e3fac4fa88f0ba418c25182005