From: Dessalines <tyhou13@gmx.com>
Date: Wed, 5 Feb 2020 21:57:20 +0000 (-0500)
Subject: Merge branch 'dev' into federation
X-Git-Url: http://these/git/readmes/README.ja.md?a=commitdiff_plain;h=f247b282620480200b16613a0826b7a5d591267d;p=lemmy.git

Merge branch 'dev' into federation
---

f247b282620480200b16613a0826b7a5d591267d