]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into patch-2
authorShel R <Yiskah.Raphen@gmail.com>
Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)
committerGitHub <noreply@github.com>
Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)
1  2 
docs/Using-Mastodon/List-of-Mastodon-instances.md

index bd1e6cd12c7a291626b627603603ffebfd761dbf,fe1daf532f9c461c37bdf9a24a30a078bbdec6fd..f255a4020c71064b2904786e678ea4a7a903ad5e
@@@ -7,7 -7,7 +7,8 @@@ 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|