diff options
author | Eugen <eugen@zeonfederated.com> | 2017-03-15 22:55:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-15 22:55:22 +0100 |
commit | e245115f47082ffba27205f508301d14e792c369 (patch) | |
tree | 21a77b788dace45b734da6e64f1b0705016192f0 /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
parent | 620f70e42c16c324459ca2da52c68f1def8683de (diff) | |
parent | c1124228e857b0e85f5bf927d2c41c7fadfdf955 (diff) |
Merge branch 'master' into mastodon-site-api
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
-rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index ed3c74294..ef3c835de 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -11,8 +11,9 @@ List of Known Mastodon instances | [epiktistes.com](https://epiktistes.com) |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| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes| | [memetastic.space](https://memetastic.space) |Memes|Yes| +| [social.diskseven.com](https://social.diskseven.com) |Single user|No| +| [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|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). |