From: Shel R Date: Sat, 8 Apr 2017 02:39:59 +0000 (-0400) Subject: Merge branch 'master' into patch-2 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c890b86ef6843bb794d895121383e1dec9ce3256;p=mastodon.git Merge branch 'master' into patch-2 --- c890b86ef6843bb794d895121383e1dec9ce3256 diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index bd1e6cd12,fe1daf532..f255a4020 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -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|