about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 12:26:02 +0200
committerGitHub <noreply@github.com>2017-04-05 12:26:02 +0200
commitba5e23ecced3ceabbeb1a8ed646eb3d24c40bf7a (patch)
tree076e236f304233ea8f1016b0790fc31f17182ddc /docs
parenta107de07c9a4bfe47bb9ca3dd64214bf3ad64533 (diff)
parentbdf3ac95b8cc2efa277570082806b5777b24dfe4 (diff)
Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
Diffstat (limited to 'docs')
-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 d0bcf8c7d..0b1720e11 100644
--- 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|