diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:15:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:15:17 -0400 |
| commit | 50910d15431ab23c803ea1537c0bdf0edfe59c45 (patch) | |
| tree | 564df1dd1139eb4d43b9ea95e9048e620c78a7a1 /docs | |
| parent | ae9d2f4a32f07362e4d0ed18f0885f3b81eb801d (diff) | |
| parent | 4ff8653d6c629d9de1e02284571d0d554c4e0502 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index aa217149d..d6211f725 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -73,6 +73,9 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.llamasweet.tech](https://mastodon.llamasweet.tech/)|Mastodon about Android developement|Yes|No| | [manx.social](https://manx.social/)|Instance for the Isle of Man|Yes|Yes| | [mastodon.host](https://mastodon.host/)|Lightly moderated, federates everywhere and has a follow bot ( Huge federated timeline )|Yes|No| +| [mastodon.fun](https://mastodon.fun/)|Mastodon for everyone ! |Yes|Yes| +| [oulipo.social](https://oulipo.social/)|An Oulipo Mastodon in which that fifth symbol in Latin script is taboo|Yes|No| +| [indigo.zone](https://indigo.zone)|Open Registrations, General Purpose|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |