From: Dessalines <tyhou13@gmx.com>
Date: Sat, 6 Apr 2019 19:18:12 +0000 (-0700)
Subject: Merge branch 'master' into documentation
X-Git-Url: http://these/git/?a=commitdiff_plain;h=ef221cc3f29b6b798727ab22eaffb71d7b32ae24;p=lemmy.git

Merge branch 'master' into documentation
---

ef221cc3f29b6b798727ab22eaffb71d7b32ae24