commit: 3a62721e541166af64419dba1ea54672bc7a73ba
parent: d6b965cf083fb24fb16a9d2a58e240c357ad4ac9
Author: Eugen <eugen@zeonfederated.com>
Date: Sun, 2 Apr 2017 16:30:30 +0200
Merge pull request #728 from bottitytto/add-mashek
Adding social.mashek.net
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git 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).
