From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 26 Mar 2017 11:13:57 +0000 (+0200)
Subject: Merge branch 'leopku-feature/language_zh-cn'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ebe53cb38c73714b267c0cffb38f1d9dbdf805d9;p=mastodon.git

Merge branch 'leopku-feature/language_zh-cn'
---

ebe53cb38c73714b267c0cffb38f1d9dbdf805d9