about summary refs log tree commit diff
path: root/docs/Using-Mastodon/List-of-Mastodon-instances.md
diff options
context:
space:
mode:
authorKibigo! <marrus-sh@users.noreply.github.com>2017-04-02 21:07:07 -0700
committerKibigo! <marrus-sh@users.noreply.github.com>2017-04-02 21:07:07 -0700
commit565568dd9c5bc82c7de40fe021e8705b95aeb32d (patch)
tree0278c53e8630fe7c262375bce023ed5948c3bc7a /docs/Using-Mastodon/List-of-Mastodon-instances.md
parent6e41ef55ed629953427accab3b3166883953125c (diff)
parent1a5ab538de2ea0c8e6f8faf357c17a90a41897e5 (diff)
Merging 'upstream' updates
Diffstat (limited to 'docs/Using-Mastodon/List-of-Mastodon-instances.md')
-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 2f307b8a0..7c8a33893 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -20,5 +20,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [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|
+| [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|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).