about summary refs log tree commit diff
path: root/docs/Using-Mastodon/List-of-Mastodon-instances.md
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:11:24 -0400
committerGitHub <noreply@github.com>2017-04-07 22:11:24 -0400
commit451b7431c9d0a8bb34642d5af599bc48701376d2 (patch)
tree1be076bbade89fa78872d09b8961b5a183230e25 /docs/Using-Mastodon/List-of-Mastodon-instances.md
parent8fa8004a2b090a3911cce11473bb926ebd6782a6 (diff)
parent530725ba3c4fefc6fd3e45cda588daa5af2ea9ec (diff)
Merge branch 'master' into patch-2
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index b4c2b8632..a1df8546c 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -47,6 +47,17 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [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|
-| [social.nowa.re](https://social.nowa.re)|Open Registration|Yes|Not Yet|
+| [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|
+
+
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).