about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-02-11 15:43:09 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-02-11 15:43:09 +0100
commite6408b2e7ade3dac8dcf14bcda5b5c6a159fa74c (patch)
tree7ba827f801bea1556231d275a6a8a35471f8a954 /docs
parent0afed995ce60dec11bc7718f83ca5afde86f6228 (diff)
parent446aad4ce2cb7afd0ba8e4b508e4dcba57eac790 (diff)
Merge branch 'feature-privacy-federation' into development
Diffstat (limited to 'docs')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md24
1 files changed, 15 insertions, 9 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 2f15df083..c4e228769 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -1,12 +1,18 @@
-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)
+| 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(?)|
+| [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|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).