diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:08:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:08:54 -0400 |
| commit | 05be34a94b79eaae7d1c4a66eb943b388940636d (patch) | |
| tree | 944d1431693e13a4a68ae5584269211b2215e17c /docs/Using-Mastodon | |
| parent | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (diff) | |
| parent | cb58694a81093230d1069040177de7f688c56d0d (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'docs/Using-Mastodon')
| -rw-r--r-- | docs/Using-Mastodon/Apps.md | 1 | ||||
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/Apps.md b/docs/Using-Mastodon/Apps.md index 67b14dc26..b5e1fa36b 100644 --- a/docs/Using-Mastodon/Apps.md +++ b/docs/Using-Mastodon/Apps.md @@ -13,5 +13,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of |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)| +|HackerNewsBot|CLI|<https://github.com/raymestalez/mastodon-hnbot>|[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)| 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 5ffeecc10..4406247d2 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -47,7 +47,15 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| -| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes| +| [mastodon.top](https://mastodon.top) |N/A|Yes|Yes| +| [niu.moe](https://niu.moe/)|:dolls: The most cutest node ever, FR/EN, anime and computer :balloon:|Yes|Yes| +| [im-in.space](https://im-in.space/)|SPAAAAACE! Probably with a lot of French people. (Invite-only, might randomly open registrations)|No|Yes| +| [social.bytestemplar.com](https://social.bytestemplar.com)|N/A|Yes|No| +| [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|No +| [design.vu](https://design.vu)|— what's your design view‽|Yes|No| +| [masto.raildecake.fr](https://masto.raildecake.fr)|Hebergé chez un FAI associatif dans le sud de la france, grillons & pins en options|Yes|No| | [good-dragon.com](https://good-dragon.com/)|Quick updates, Relaxed Moderation, Federates Everywhere, Furries|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). |