about summary refs log tree commit diff
path: root/docs/Using-Mastodon
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-08 11:39:25 +0200
committerGitHub <noreply@github.com>2017-04-08 11:39:25 +0200
commit9f9f4b248e1cb879d11b782ddcb91e7fcc3238d8 (patch)
treeb3d287fe108a29268cacb165e1285ead432965be /docs/Using-Mastodon
parent3660f01f60bec405acab672634e184ee5b5b8e46 (diff)
parent3c48c9ac2eb44a8de199c4d1f397be5e02520c3a (diff)
Merge pull request #887 from valentin2105/master
add persistance to Postresql container
Diffstat (limited to 'docs/Using-Mastodon')
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index ca1fa4c19..91c27b015 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -45,6 +45,8 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No|
 | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No|
 | [manowar.social](https://manowar.social)|N/A|No|No|
+| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No|
+| [mastodon.cloud](https://mastodon.cloud)|Open Mastodon instance with people from everywhere.|Yes|Yes|
 | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No|
 | [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|