about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-02 16:30:30 +0200
committerGitHub <noreply@github.com>2017-04-02 16:30:30 +0200
commit3a62721e541166af64419dba1ea54672bc7a73ba (patch)
tree2237572ea94749e3644491f2d087a0912b058d15
parentd6b965cf083fb24fb16a9d2a58e240c357ad4ac9 (diff)
parentaaea7e1e7c77692827f6a7f3571c8333b8bc231f (diff)
Merge pull request #728 from bottitytto/add-mashek
Adding social.mashek.net
-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 3246f3ccb..182a2e83e 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -16,5 +16,6 @@ List of Known Mastodon instances
 | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No|
 | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes|
 | [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|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).