about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 23:07:50 -0400
committerGitHub <noreply@github.com>2017-04-07 23:07:50 -0400
commit41923d1c6ba28df6652aefd9619acc33a5cf467a (patch)
treecf24925ee083396659048373096e8907de458341 /docs
parenta25a384af3d08a05bc0907261f76410da36cbb10 (diff)
parent63686fd36f9dead2bc0d4b3cb53d841a9b320da2 (diff)
Merge pull request #1186 from Aguay-val/patch-2
Add mastodon.fun
Diffstat (limited to 'docs')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 2386f574c..43e6be742 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -73,6 +73,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.llamasweet.tech](https://mastodon.llamasweet.tech/)|Mastodon about Android developement|Yes|No|
 | [manx.social](https://manx.social/)|Instance for the Isle of Man|Yes|Yes|
 | [mastodon.host](https://mastodon.host/)|Lightly moderated, federates everywhere and has a follow bot ( Huge federated timeline )|Yes|No|
-
+| [mastodon.fun](https://mastodon.fun/)|Mastodon for everyone ! |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).