about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 03:19:14 +0200
committerGitHub <noreply@github.com>2017-04-05 03:19:14 +0200
commit78c1e2e9582f582b627e0144076bb76a886a41c2 (patch)
tree259de6b676b6ca29687faa770089e3957049ea65 /docs/Using-Mastodon
parent7015578655553b89e0184e6fe10b88075f4d8446 (diff)
parentab98591af83ef7a617a877cc8519b203e0481e8a (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'docs/Using-Mastodon')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index d971147b6..9a49ff492 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -15,7 +15,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)|Yes|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|
@@ -24,8 +24,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|
@@ -38,5 +40,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [manowar.social](https://manowar.social)|N/A|No|No|
 | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|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).