diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-05 12:33:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 12:33:02 +0200 |
| commit | f8a5ff95ec4825d47cdf0fb2551dcd058fddab29 (patch) | |
| tree | 0b217c87e7113a0848bb807555ed80096e8024a2 /docs | |
| parent | af0decf597b9235f4f9f0959e8c003fceab8fb88 (diff) | |
| parent | 5963fce131b3bbfbe0a93b1b11a76d3efadce61f (diff) | |
Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 |
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 ce3420c87..0b98f8552 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.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| | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No| |