From: Eugen Date: Wed, 5 Apr 2017 01:07:59 +0000 (+0200) Subject: Merge pull request #845 from thurloat/patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1c634ad21a0de83ddd8e9f4309fc05cc2613d3ef;p=mastodon.git Merge pull request #845 from thurloat/patch-1 Add mastodon.club to running instances list --- 1c634ad21a0de83ddd8e9f4309fc05cc2613d3ef diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index 7fa21ea64,380ff63c0..f4432bbd0 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -24,9 -24,9 +24,10 @@@ There is also a list at [instances.mast | [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,6 -38,6 +39,7 @@@ | [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)|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).