From: Dessalines <tyhou13@gmx.com>
Date: Sat, 10 Aug 2019 17:38:40 +0000 (-0700)
Subject: Merge branch 'i18n-zh' of https://github.com/tqcenglish/lemmy into tqcenglish-i18n-zh
X-Git-Url: http://these/git/%22https:/nerdica.net/static/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=3656a3009b4fadd8434bebb1615656c3cccc43ed;p=lemmy.git

Merge branch 'i18n-zh' of https://github.com/tqcenglish/lemmy into tqcenglish-i18n-zh
---

3656a3009b4fadd8434bebb1615656c3cccc43ed