about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
authorJantsoP <jantso.porali@gmail.com>2017-04-04 08:41:46 +0200
committerGitHub <noreply@github.com>2017-04-04 08:41:46 +0200
commitdb4a41cf58f6b15e380ff1fdbc8f392e31e4235b (patch)
treea68429f1bade4869fccc4af5bcef8afbe570e1e1 /docs/Using-Mastodon
parentdc89fc17cc35f8e1deaffb30ae581ac453a7a9fc (diff)
parenteb023beb4975a019d6a3b3091483c91c2c837bbd (diff)
Merge branch 'master' into master
Diffstat (limited to 'docs/Using-Mastodon')
-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 7c8a33893..780977bd4 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -21,5 +21,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [social.mashek.net](https://social.mashek.net) |Themed and customised for Mashekstein Labs community. Selectively federates.|Yes|No|
 | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes|
 | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes|
+| [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).