From: Shel R Date: Sat, 8 Apr 2017 01:48:19 +0000 (-0400) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5dfc9854f1612bc7e55524175170fd40c7dbe21a;p=mastodon.git Merge branch 'master' into patch-1 --- 5dfc9854f1612bc7e55524175170fd40c7dbe21a diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index a99598eaf,9a6dd6f15..c4c4ac3f1 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -47,7 -47,10 +47,10 @@@ There is also a list at [instances.mast | [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).