about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 10:29:14 +0200
committerGitHub <noreply@github.com>2017-04-05 10:29:14 +0200
commit78cf0fe1c7981bd3770b80772eb7295bc2a0b753 (patch)
treecce13e8b9a96ee3dd48a097f28b6c338c20b22da
parent18d0e817dd1dd88de1c597ade3d1cff71b4e8391 (diff)
parent128dcb28253a43cfc2552091f419048dd3b94a9f (diff)
Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
-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 8b8aba124..e7c32521a 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -41,5 +41,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes|
 | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes|
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
+| [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|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).