]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into patch-1
authorEugen <eugen@zeonfederated.com>
Wed, 5 Apr 2017 01:19:14 +0000 (03:19 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 01:19:14 +0000 (03:19 +0200)
1  2 
docs/Using-Mastodon/List-of-Mastodon-instances.md

index d971147b6a576fd0bee0898b4bbe2502e9f0f88d,b04121b7e6488d0d0df2242712ff250b5c0d224e..9a49ff492525dbef141fcfb2415332696bb4bf07
@@@ -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).