From: Eugen Date: Tue, 4 Apr 2017 12:51:42 +0000 (+0200) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=48dfdad49255ae4a100e01f41852e65806858fce;p=mastodon.git Merge branch 'master' into patch-1 --- 48dfdad49255ae4a100e01f41852e65806858fce diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index aac3841b3,dc4cf4484..677ec7e56 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -22,6 -23,18 +23,19 @@@ There is also a list at [instances.mast | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| +| [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| + | [hostux.social](https://hostux.social) |N/A|Yes|Yes| + | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| + | [maly.io](https://maly.io) |N/A|Yes|No| + | [social.lou.lt](https://social.lou.lt) |N/A|Yes|No| + | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No| + | [soc.louiz.org](https://soc.louiz.org) |"Coucou"|Yes|No| + | [7nw.eu](https://7nw.eu) |N/A|Yes|No| + | [mastodon.gougere.fr](https://mastodon.gougere.fr)|N/A|Yes|No| + | [aleph.land](https://aleph.land)|N/A|Yes|No| + | [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| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).