commit: a23123e49c1449c807538bf75ff5db535a2aadf8
parent: ab98591af83ef7a617a877cc8519b203e0481e8a
Author: Eugen <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2017 03:20:01 +0200
Merge pull request #859 from dereckson/patch-1
Add social.nasqueron.org instance
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git 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|
