From: Eugen <eugen@zeonfederated.com>
Date: Fri, 10 Feb 2017 18:15:13 +0000 (+0100)
Subject: Merge branch 'master' into patch-3
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=874fffb7dc928904927a84838c40f7383ab30368;p=mastodon.git

Merge branch 'master' into patch-3
---

874fffb7dc928904927a84838c40f7383ab30368
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
index 39e34b8a0,73e7ded1d..04a326ad9
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@@ -1,18 -1,13 +1,17 @@@
 -List of Mastodon instances
 +List of Known Mastodon instances
  ==========================
  
- 
 -* [mastodon.social](https://mastodon.social)
 -* [social.tchncs.de](https://social.tchncs.de)
 -* [on.vu](https://on.vu)
 -* [animalliberation.social](https://animalliberation.social)
 -* [socially.constructed.space](https://socially.constructed.space)
 -* [epiktistes.com](https://epiktistes.com)
 -* [toot.zone](https://toot.zone)
 -* [awoo.space](https://awoo.space/)
 +| Name | Theme/Notes, if applicable | Open Registrations |
 +| -------------|-------------|---|
 +| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|
 +| [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|
 +| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|
 +| [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|
 +| [socially.constructed.space](https://socially.constructed.space) |Single user|No|
 +| [epiktistes.com](https://epiktistes.com) |N/A|Yes|
 +| [toot.zone](https://toot.zone) |N/A|Yes|
 +| [on.vu](https://on.vu) | Appears defunct|No|
 +| [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)|
  
 -Let me know if you start running one so I can add it to the list!
 +
 +Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).