commit: f8a5ff95ec4825d47cdf0fb2551dcd058fddab29
parent: af0decf597b9235f4f9f0959e8c003fceab8fb88
Author: Eugen <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2017 12:33:02 +0200
Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
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.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|
