diff options
| author | Valentin Ouvrard <valentin210594@gmail.com> | 2017-04-08 13:39:31 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 13:39:31 +1100 |
| commit | 5b571fc4346c044333c5bfc86d664a39a1807314 (patch) | |
| tree | 038a42eecf0f6e66d3e5a2eb334690f8d7a260b3 /docs | |
| parent | 3e4eb9c95fc8d8f3fff1db90215d5050214adc59 (diff) | |
| parent | ceba26d5276b18d0de29fc989ef7c343e6a85962 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 |
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 68df2f218..3b3ba9187 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -21,6 +21,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.land](https://mastodon.land) |N/A|Yes|Yes| | [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Party 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| |