about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-04 14:49:48 +0200
committerGitHub <noreply@github.com>2017-04-04 14:49:48 +0200
commit7c075b5551ab98882815d452c70f15bb544c659b (patch)
treea569ea1030e7c846814e34883edbb31ac1c570de /docs
parent1e81cad3f3b59dcce8ea2aaa63f9179344975d5a (diff)
parent8a45a97e2e1ed74983ce25bcf0e03f51ed2eb8fe (diff)
Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
Diffstat (limited to 'docs')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 780977bd4..c424cab64 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -22,5 +22,18 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [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|
+| [hostux.social](https://hostux.social) |N/A|Yes|Yes|
+| [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes|
+| [maly.io](https://maly.io) |N/A|Yes|No|
+| [social.lou.lt](https://social.lou.lt) |N/A|Yes|No|
+| [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No|
+| [soc.louiz.org](https://soc.louiz.org) |"Coucou"|Yes|No|
+| [7nw.eu](https://7nw.eu) |N/A|Yes|No|
+| [mastodon.gougere.fr](https://mastodon.gougere.fr)|N/A|Yes|No|
+| [aleph.land](https://aleph.land)|N/A|Yes|No|
+| [share.elouworld.org](https://share.elouworld.org)|N/A|No|No|
+| [social.lkw.tf](https://social.lkw.tf)|N/A|No|No|
+| [manowar.social](https://manowar.social)|N/A|No|No|
+| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).