commit: ba5e23ecced3ceabbeb1a8ed646eb3d24c40bf7a
parent: a107de07c9a4bfe47bb9ca3dd64214bf3ad64533
Author: Eugen <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2017 12:26:02 +0200
Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -19,6 +19,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
| [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|
| [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes|
