From: Eugen Date: Wed, 5 Apr 2017 01:19:14 +0000 (+0200) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=78c1e2e9582f582b627e0144076bb76a886a41c2;p=mastodon.git Merge branch 'master' into patch-1 --- 78c1e2e9582f582b627e0144076bb76a886a41c2 diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index d971147b6,b04121b7e..9a49ff492 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -37,6 -39,7 +39,8 @@@ There is also a list at [instances.mast | [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| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).