From: Shel R Date: Sat, 8 Apr 2017 01:42:10 +0000 (-0400) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=065defefac7f1e7e05190f7853699dae9ecbf37a;p=mastodon.git Merge branch 'master' into patch-1 --- 065defefac7f1e7e05190f7853699dae9ecbf37a diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index 2918db8e8,e0bb3d368..3d15aaac2 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -47,7 -47,7 +47,9 @@@ 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| + + Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).