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

index a295d282b278bcf9dfec7abb6a83934126d5b57c,c4c4ac3f149ee9ab8f4b1d4f6521ef1990701f4c..f7a046949aa4781e0547d863b29e9de5068096ea
@@@ -47,7 -47,10 +47,11 @@@ 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|
- | [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|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
  
  Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).