From: Shel R Date: Sat, 8 Apr 2017 02:35:45 +0000 (-0400) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c945f29e96d537a827b95b3efb035ec8084576a1;p=mastodon.git Merge branch 'master' into patch-1 --- c945f29e96d537a827b95b3efb035ec8084576a1 diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index 69a58601b,2084c7c14..95437c0ec --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -47,7 -48,21 +48,22 @@@ 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| + | [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| + | [masto.raildecake.fr](https://masto.raildecake.fr)|Hebergé chez un FAI associatif dans le sud de la france, grillons & pins en options|Yes|No| + | [good-dragon.com](https://good-dragon.com/)|Quick updates, Relaxed Moderation, Federates Everywhere, Furries|Yes|No| + | [rich.gop](https://rich.gop/)|Federates everywhere, Open registration, Privacy respected|Yes|Yes| + | [social.nowa.re](https://social.nowa.re)|Open Registration|Yes|No| + | [mastodon.ml](http://mastodon.ml) |A chill place to hangout and chat about anime, programming and movies.|Yes|Yes| + | [off-the-clock.us](https://off-the-clock.us/)|The work day is over.|Yes|No| + | [infinimatix.net](https://infinimatix.net)|Informatics|Yes|Yes| -| [mastodon.elao.com](https://mastodon.elao.com/)|OpenSource WebTech Agency. (France)|Yes|No| +| [social.0day.agency](https://social.0day.agency)|Infosec, Hacking, Fun (only protonmail)|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).