commit: 9fd8bbe15c18e0931ccf2c00fb6a1e69acfb0b0c
parent: 7004c692040d9372c187a13a21f1215f07d3a8ff
Author: Shel R <Yiskah.Raphen@gmail.com>
Date: Fri, 7 Apr 2017 22:16:49 -0400
Merge pull request #992 from Eychics/master
Add mastodon.nuzgo.net in instance list
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -7,6 +7,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
| -------------|-------------|---|---|
| [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|
| [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|