From: Felix Ableitner <me@nutomic.com>
Date: Tue, 14 Jul 2020 22:44:31 +0000 (+0200)
Subject: Merge pull request #972 from LemmyNet/master_to_main
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/README.zh.hans.md?a=commitdiff_plain;h=e04d014a3abd2035876730c93e089e86a435a57f;p=lemmy.git

Merge pull request #972 from LemmyNet/master_to_main

Changing references from master to main. #820
---

e04d014a3abd2035876730c93e089e86a435a57f