From: Shel R <Yiskah.Raphen@gmail.com>
Date: Sat, 8 Apr 2017 02:41:07 +0000 (-0400)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9edee2e64f30667e6f848bb7e27adb82cf1f91cd;p=mastodon.git

Merge branch 'master' into patch-1
---

9edee2e64f30667e6f848bb7e27adb82cf1f91cd
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1910a924b,f255a4020..5ba8c51b2
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@@ -7,6 -7,8 +7,7 @@@ There is also a list at [instances.mast
  | -------------|-------------|---|---|
  | [mastodon.social](https://mastodon.social) |Flagship, quick updates|No|No|
  | [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes|
+ | [mastodon.nuzgo.net](https://mastodon.nuzgo.net/) |Mastodon instance hosted in Paris |Yes|No|
 -| [hackertribe.io](https://hackertribe.io) |Community of people who are interested in Startups, Programming, Science, and Technology.|Yes|Yes|
  | [mastodon.cx](https://mastodon.cx/) |Alternative Mastodon instance hosted in France|Yes|Yes|
  | [mastodon.network](https://mastodon.network) |N/A|Yes|Yes|
  | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No|
@@@ -20,6 -22,6 +21,7 @@@
  | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes|
  | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No|
  | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes|
++| [mastodon.land](https://mastodon.land) |N/A|Yes|Yes|
  | [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Party Instance - Politics and stuff|Yes|No|
  | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes|
  | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes|
@@@ -47,7 -49,22 +49,23 @@@
  | [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|
  
+ 
+ 
  Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).