From: Dessalines <tyhou13@gmx.com>
Date: Fri, 8 May 2020 18:03:05 +0000 (-0400)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/static/%7B%60https:/README.ja.md?a=commitdiff_plain;h=a6d9a9e1a8c496f2d230ac7dfcfa3b483c434f60;p=lemmy.git

Merge branch 'dev'
---

a6d9a9e1a8c496f2d230ac7dfcfa3b483c434f60