about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 03:07:46 +0200
committerGitHub <noreply@github.com>2017-04-05 03:07:46 +0200
commit682c8a6fc80507ab51ce4a288bca1e1a16c4a64b (patch)
tree8fc4a27adae2ec442a048a221f9d6af83090eb47 /docs/Using-Mastodon
parent66ec005bf83e25259741dcb48844a35c42de8dfa (diff)
parent22000ef7a91f00058b69e26a0bac0298966d4cf7 (diff)
Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
Diffstat (limited to 'docs/Using-Mastodon')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 17a72d77d..7fa21ea64 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -26,6 +26,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [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|
+| [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|
 | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No|