about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
Diffstat (limited to 'docs/Using-Mastodon')
-rw-r--r--docs/Using-Mastodon/Apps.md14
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md32
2 files changed, 27 insertions, 19 deletions
diff --git a/docs/Using-Mastodon/Apps.md b/docs/Using-Mastodon/Apps.md
index e350e5f95..67b14dc26 100644
--- a/docs/Using-Mastodon/Apps.md
+++ b/docs/Using-Mastodon/Apps.md
@@ -5,11 +5,13 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 
 |App|Platform|Link|Developer(s)|
 |---|--------|----|------------|
-|Matodor|iOS/Android|<https://github.com/jeroensmeets/mastodon-app>|[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)|
-|Tusky|Android|<https://github.com/Vavassor/Tusky>|[@Vavassor@mastodon.social](https://mastodon.social/users/Vavassor)|
-|Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)|
-|tootstream|command-line|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
-|mastodroid|Android|<https://github.com/alin-rautoiu/mastodroid>||
-|Tooter|Chrome extension|<https://github.com/ineffyble/tooter>|[@effy@mastodon.social](https://mastodon.social/users/effy)|
+|[Tusky](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky)|Android|<https://github.com/Vavassor/Tusky>|[@Vavassor@mastodon.social](https://mastodon.social/users/Vavassor)|
+|mastodroid|Android|<https://github.com/alin-rautoiu/mastodroid>|[@charlag@mastodon.social](https://mastodon.social/users/charlag)|
 |TootyFruity|Android|<https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258>|[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
+|11t|iOS/Android|<https://github.com/jeroensmeets/mastodon-app>|[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)|
+|[Amaroq](https://itunes.apple.com/us/app/amarok-for-mastodon/id1214116200?ls=1&mt=8)|iOS|<https://itunes.apple.com/us/app/amarok-for-mastodon/id1214116200?ls=1&mt=8>|[@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)|
+|Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)|
+|Tooter|Chrome|<https://github.com/ineffyble/tooter>|[@effy@mastodon.social](https://mastodon.social/users/effy)|
+|tootstream|CLI|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
+
 If you have a project like this, let me know so I can add it to the list!
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index ed3c74294..2f307b8a0 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -1,18 +1,24 @@
 List of Known Mastodon instances
 ==========================
 
-| Name | Theme/Notes, if applicable | Open Registrations |
-| -------------|-------------|---|
-| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|
-| [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|
-| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|
-| [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|
-| [socially.constructed.space](https://socially.constructed.space) |Single user|No|
-| [epiktistes.com](https://epiktistes.com) |N/A|Yes|
-| [on.vu](https://on.vu) | Appears defunct|No|
-| [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)|
-| [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|Yes|
-| [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|
-| [memetastic.space](https://memetastic.space) |Memes|Yes|
+There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) showing realtime information about instances.
+
+| Name | Theme/Notes, if applicable | Open Registrations | IPv6 |
+| -------------|-------------|---|---|
+| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|No|
+| [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No|
+| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|No|
+| [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No|
+| [socially.constructed.space](https://socially.constructed.space) |Single user|No|No|
+| [epiktistes.com](https://epiktistes.com) |N/A|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|
+| [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.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) |N/A|Yes|No|
+| [social.mashek.net](https://social.mashek.net) |Themed and customised for Mashekstein Labs community. Selectively federates.|Yes|No|
+| [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).