diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-04 14:50:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 14:50:35 +0200 |
| commit | c359e600341d89068fcb45d9140cb3355616fb2d (patch) | |
| tree | bc930842f1e4c37da19916a02bcf613f1dd7f628 | |
| parent | 4bb623a5954a471f42dd55158eb5cd63ece20e96 (diff) | |
| parent | cc451e1fcbb7682c2f440e6cf624d0086fae0e11 (diff) | |
Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index c424cab64..2ffe635a7 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -17,7 +17,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.diskseven.com](https://social.diskseven.com) |Single user|No|No (DNS entry but no response)| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| -| [social.targaryen.house](https://social.targaryen.house) |N/A|Yes|No| +| [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| | [social.mashek.net](https://social.mashek.net) |Themed and customised for Mashekstein Labs community. Selectively federates.|Yes|No| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| |