From: Eugen <eugen@zeonfederated.com>
Date: Sun, 26 Mar 2017 19:45:49 +0000 (+0200)
Subject: Merge pull request #688 from yiskah/patch-3
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=448a07cc3f4e4f6905b6b1c519c29d28b72bda2b;p=mastodon.git

Merge pull request #688 from yiskah/patch-3

Update amaroq name
---

448a07cc3f4e4f6905b6b1c519c29d28b72bda2b