diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:02:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:02:26 -0400 |
| commit | 9f43e3b428c0adea4af75fc4e340799954e42221 (patch) | |
| tree | ab2b6bb407ca6310d63b84af6f64ab4dca90a2dc /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
| parent | 8989569dd42aabd9c768927f0975401af89bceb3 (diff) | |
| parent | 4a40b40324aa50ec0c42d574f78bb45835dfe295 (diff) | |
Merge branch 'master' into patch-4
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 1f5be3a61..fa6b8af85 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -47,6 +47,12 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| -| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes| +| [mastodon.top](https://mastodon.top) |N/A|Yes|Yes| +| [niu.moe](https://niu.moe/)|:dolls: The most cutest node ever, FR/EN, anime and computer :balloon:|Yes|Yes| +| [im-in.space](https://im-in.space/)|SPAAAAACE! Probably with a lot of French people. (Invite-only, might randomly open registrations)|No|Yes| +| [social.bytestemplar.com](https://social.bytestemplar.com)|N/A|Yes|No| +| [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|No +| [design.vu](https://design.vu)|— what's your design view‽|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). |