diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:20:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 03:20:01 +0200 |
| commit | a23123e49c1449c807538bf75ff5db535a2aadf8 (patch) | |
| tree | 259de6b676b6ca29687faa770089e3957049ea65 /docs | |
| parent | ab98591af83ef7a617a877cc8519b203e0481e8a (diff) | |
| parent | 78c1e2e9582f582b627e0144076bb76a886a41c2 (diff) | |
Merge pull request #859 from dereckson/patch-1
Add social.nasqueron.org instance
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 b04121b7e..9a49ff492 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -39,6 +39,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes| | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| |