From: Eugen <eugen@zeonfederated.com>
Date: Sat, 4 Mar 2017 11:17:50 +0000 (+0100)
Subject: Merge pull request #663 from console-cowboy/patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4cbeb9a7eb4d24cfa1fd2ce6e4a2e731c486925d;p=mastodon.git

Merge pull request #663 from console-cowboy/patch-1

add social.gestaltzerfall.net instance information
---

4cbeb9a7eb4d24cfa1fd2ce6e4a2e731c486925d