about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:16:49 -0400
committerGitHub <noreply@github.com>2017-04-07 22:16:49 -0400
commit9fd8bbe15c18e0931ccf2c00fb6a1e69acfb0b0c (patch)
tree852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /docs
parent7004c692040d9372c187a13a21f1215f07d3a8ff (diff)
parent1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (diff)
Merge pull request #992 from Eychics/master
Add mastodon.nuzgo.net in instance list
Diffstat (limited to 'docs')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index ce02ac2c0..4d853597e 100644
--- 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|