diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:07:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 03:07:59 +0200 |
commit | 1c634ad21a0de83ddd8e9f4309fc05cc2613d3ef (patch) | |
tree | dfe2544336c3537e072009855c891df54e13676a /docs | |
parent | 682c8a6fc80507ab51ce4a288bca1e1a16c4a64b (diff) | |
parent | 192f079776322605accf81cb422ce1b0c7743247 (diff) |
Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
Diffstat (limited to 'docs')
-rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 7fa21ea64..f4432bbd0 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -24,6 +24,7 @@ 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| @@ -40,4 +41,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| | [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). |