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

index 5f8ef791c1d7f6709e8a95df6010c3837b0f12f9,aff94a15e9a56158cb9bd5da6567f94bf38de9a9..b04121b7e6488d0d0df2242712ff250b5c0d224e
@@@ -37,6 -39,7 +39,7 @@@ 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|
 +| [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).