about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-04 14:51:47 +0200
committerGitHub <noreply@github.com>2017-04-04 14:51:47 +0200
commitfee331219389cf2a26c4f98a9ba858853838be4e (patch)
treea2bfe7a94bcd7a37399470b31c0453e1b489dea9 /docs/Using-Mastodon
parented4a723a82e90fc057494e4fdec4a2074a3164c7 (diff)
parent48dfdad49255ae4a100e01f41852e65806858fce (diff)
Merge pull request #803 from 0xa/patch-1
Add octodon.social
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 dc4cf4484..677ec7e56 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -23,6 +23,7 @@ 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|
+| [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance 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|