]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into master
authorShel R <Yiskah.Raphen@gmail.com>
Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)
committerGitHub <noreply@github.com>
Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)
1  2 
docs/Using-Mastodon/List-of-Mastodon-instances.md

index cf56d8c3e2f1883546fa1412266a89facc9f100f,eac9d83589e72527036bfd756922acec084361ab..43f559fb5f57f67d45795858529ee29032bd44a5
@@@ -47,7 -49,23 +49,24 @@@ 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|
+ | [social.0day.agency](https://social.0day.agency)|Infosec, Hacking, Fun (only protonmail)|Yes|Yes|
+ | [kagrumez.lerk.io](https://kagrumez.lerk.io)|Open registration. German end english.|Yes|No|
+ | [meow.social](https://meow.social)|A furry fandom focused instance|Yes|No|
 +| [neumastodon.com](https://neumastodon.com/)|Northeastern University Mastodon | 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).