diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:48:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:48:19 -0400 |
| commit | 5dfc9854f1612bc7e55524175170fd40c7dbe21a (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
| parent | 9cf0b5b2557a6e26542a39c3fb31f46a15073662 (diff) | |
| parent | b300bb3b4e45d7e52a5a0f2db3c9ed383fc4ebbb (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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index a99598eaf..c4c4ac3f1 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -47,7 +47,10 @@ 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| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |