diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:20:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 03:20:37 +0200 |
commit | aa464aa0d81607696e81b559471b089f4bb2ac11 (patch) | |
tree | 41fdf3a2227ce785bbf152d85e57236393509ea4 /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
parent | 41ba74b511916330771c097cd74f3bc07801291f (diff) | |
parent | a23123e49c1449c807538bf75ff5db535a2aadf8 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
-rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index b0c9c58fd..0cd3f18d6 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -14,7 +14,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|No|No| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|No| | [memetastic.space](https://memetastic.space) |Memes|Yes|No| -| [social.diskseven.com](https://social.diskseven.com) |Single user|No|No (DNS entry but no response)| +| [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| @@ -22,8 +22,10 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| +| [mastodon.club](https://mastodon.club)|Open Registration, Open Federation, Mostly Canadians|Yes|No| | [hostux.social](https://hostux.social) |N/A|Yes|Yes| | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| +| [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes| | [maly.io](https://maly.io) |N/A|Yes|No| | [social.lou.lt](https://social.lou.lt) |N/A|Yes|No| | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No| @@ -35,5 +37,8 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No| +| [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| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |