diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:37:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:37:51 -0400 |
| commit | fc7b8307190b8f472b526d99bc10db58153850d5 (patch) | |
| tree | dac7e26c482f0a69e00f031e771e58858e64b054 /docs/Using-Mastodon | |
| parent | 0d4d42dce6e7b0856469317da9e039ec5dc431b1 (diff) | |
| parent | c945f29e96d537a827b95b3efb035ec8084576a1 (diff) | |
Merge pull request #1036 from wirehack7/patch-1
Update List-of-Mastodon-instances.md
Diffstat (limited to 'docs/Using-Mastodon')
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 2084c7c14..95437c0ec 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -62,7 +62,8 @@ 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| +| [social.0day.agency](https://social.0day.agency)|Infosec, Hacking, Fun (only protonmail)|Yes|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). |