Merge branch 'master' into patch-1

diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
index b0c9c58fd57a2714f3781d634db06b45224c88c3,9a49ff492525dbef141fcfb2415332696bb4bf07..0cd3f18d670b65b940e98aaff05f8ccd04341ee4
--- 1/docs/Using-Mastodon/List-of-Mastodon-instances.md
--- 2/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@@ -11,10 -12,10 +11,10 @@@ There is also a list at [instances.mast
  | [socially.constructed.space](https://socially.constructed.space) |Single user|No|No|
  | [epiktistes.com](https://epiktistes.com) |N/A|Yes|No|
  | [fern.surgeplay.com](https://fern.surgeplay.com) |Federates everywhere, Minecraft-focused|Yes|No
 -| [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|Yes|No|
 +| [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|No|No|
  | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|No|
  | [memetastic.space](https://memetastic.space) |Memes|Yes|No|
- | [social.diskseven.com](https://social.diskseven.com) |Single user|No|No (DNS entry but no response)|
+ | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes|
  | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No|
  | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes|
  | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes|
@@@ -34,6 -38,9 +36,9 @@@
  | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No|
  | [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.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|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).