diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-03 01:07:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 01:07:53 +0200 |
| commit | d2358aefecb6858eab641752a3279cdaa824eaa3 (patch) | |
| tree | c9393bbbe41a1c72bc2e40e924083c242f16588b /docs/Using-Mastodon/List-of-Mastodon-instances.md | |
| parent | c76d20c2a0572f1da7d2fafcd6c7a90aa6caf7f1 (diff) | |
| parent | 30df1c8476739a7439762eb678962a5254918323 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
| -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 a7e818649..2f307b8a0 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -19,5 +19,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [social.targaryen.house](https://social.targaryen.house) |N/A|Yes|No| | [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| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |