]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into master
authorValentin Ouvrard <valentin210594@gmail.com>
Sat, 8 Apr 2017 02:39:09 +0000 (13:39 +1100)
committerGitHub <noreply@github.com>
Sat, 8 Apr 2017 02:39:09 +0000 (13:39 +1100)
1  2 
docs/Using-Mastodon/List-of-Mastodon-instances.md

index d326c4ec8bd1e3d5cac947df9d33fce2a0ac9180,95437c0eca29a7aad060900958498830f83d8d50..68df2f2189b73b73eb79ce6ed2d6bd71e7a1aa24
@@@ -36,7 -43,27 +43,29 @@@ There is also a list at [instances.mast
  | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No|
  | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No|
  | [manowar.social](https://manowar.social)|N/A|No|No|
 +| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No|
 +| [mastodon.cloud](https://mastodon.cloud)|Open Mastodon instance with people from everywhere.|Yes|Yes|
+ | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No|
+ | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes|
+ | [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|
+ | [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|
  
  Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).