about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-02-13 20:42:40 +0100
committerGitHub <noreply@github.com>2017-02-13 20:42:40 +0100
commitbae7cf8ccecd7c670cd4c1a00c5c19f85c2487b6 (patch)
tree5728c1406f045fa3de92e4130ab75dfea873e047 /docs
parentfae1799646e752235123a981a1ca27c4070ebb5f (diff)
parent7a99699e2dbf4d2d3bf57a7d5c38245a7316c21c (diff)
Merge pull request #630 from yiskah/patch-6
Add memetastic.space to instance list
Diffstat (limited to 'docs')
-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 95f363c8c..ed3c74294 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -13,5 +13,6 @@ List of Known Mastodon instances
 | [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)|
 | [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|Yes|
 | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|
+| [memetastic.space](https://memetastic.space) |Memes|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).