From: Eugen <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2017 08:29:52 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8b8839978a222ed53a3dc33eb99f87edc8794000;p=mastodon.git

Merge branch 'master' into master
---

8b8839978a222ed53a3dc33eb99f87edc8794000
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
index 6b6eda74c,e7c32521a..d0bcf8c7d
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@@ -5,8 -5,8 +5,9 @@@ There is also a list at [instances.mast
  
  | Name | Theme/Notes, if applicable | Open Registrations | IPv6 |
  | -------------|-------------|---|---|
--| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|No|
++| [mastodon.social](https://mastodon.social) |Flagship, quick updates|No|No|
 +| [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes|
+ | [mastodon.network](https://mastodon.network) |N/A|Yes|Yes|
  | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No|
  | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No|
  | [socially.constructed.space](https://socially.constructed.space) |Single user|No|No|