diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-05 10:29:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 10:29:52 +0200 |
commit | 8b8839978a222ed53a3dc33eb99f87edc8794000 (patch) | |
tree | e140ef9317152e6e40e9cb7061413736605158fe /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
parent | 29efeecb9ebd4eac0ec65040b2f688d7a5c77283 (diff) | |
parent | 78cf0fe1c7981bd3770b80772eb7295bc2a0b753 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
-rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 6b6eda74c..d0bcf8c7d 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -5,8 +5,9 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | 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| @@ -41,5 +42,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes| | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| +| [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |