From: Eugen Date: Wed, 5 Apr 2017 10:26:17 +0000 (+0200) Subject: Merge pull request #925 from Angristan/patch-6 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=af0decf597b9235f4f9f0959e8c003fceab8fb88;p=mastodon.git Merge pull request #925 from Angristan/patch-6 Add mstdn.io --- af0decf597b9235f4f9f0959e8c003fceab8fb88 diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index 0b1720e11,a23cdafde..ce3420c87 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -19,9 -19,9 +19,10 @@@ There is also a list at [instances.mast | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| +| [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Part Instance - Politics and stuff|Yes|No| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| + | [mstdn.io](https://mstdn.io) |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|