about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:35:08 -0400
committerGitHub <noreply@github.com>2017-04-07 22:35:08 -0400
commit0d4d42dce6e7b0856469317da9e039ec5dc431b1 (patch)
treed4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /docs
parent698d74a15fe8db61de057b8876e9967e9e9c7330 (diff)
parentcf03634e74364af3a703ea09073ab0a58448d460 (diff)
Merge pull request #1035 from gfaivre/add-elao-com-instance
Add mastodon.elao.com instance
Diffstat (limited to 'docs')
-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 29b0e9b01..2084c7c14 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -62,6 +62,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.ml](http://mastodon.ml) |A chill place to hangout and chat about anime, programming and movies.|Yes|Yes|
 | [off-the-clock.us](https://off-the-clock.us/)|The work day is over.|Yes|No|
 | [infinimatix.net](https://infinimatix.net)|Informatics|Yes|Yes|
+| [mastodon.elao.com](https://mastodon.elao.com/)|OpenSource WebTech Agency. (France)|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).