commit: fc7b8307190b8f472b526d99bc10db58153850d5
parent: 0d4d42dce6e7b0856469317da9e039ec5dc431b1
Author: Shel R <Yiskah.Raphen@gmail.com>
Date: Fri, 7 Apr 2017 22:37:51 -0400
Merge pull request #1036 from wirehack7/patch-1
Update List-of-Mastodon-instances.md
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git 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).