From: Shel R Date: Sat, 8 Apr 2017 03:03:07 +0000 (-0400) Subject: Merge branch 'master' into patch-1 X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ae9d2f4a32f07362e4d0ed18f0885f3b81eb801d;p=mastodon.git Merge branch 'master' into patch-1 --- ae9d2f4a32f07362e4d0ed18f0885f3b81eb801d diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md index 2bade230e,2386f574c..aa217149d --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@@ -33,8 -36,8 +36,8 @@@ There is also a list at [instances.mast | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| | [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes| | [maly.io](https://maly.io) |N/A|Yes|No| -| [social.lou.lt](https://social.lou.lt) |N/A|Yes|No| +| [social.lou.lt](https://social.lou.lt) |Francophones|Yes|No| - | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No| + | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |Open registrations, furry-friendly, UK-based|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|