Merge pull request #799 from Wonderfall/master

author Eugen <eugen@zeonfederated.com>

Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)
author Eugen <eugen@zeonfederated.com>
Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
Simple merge
author	Eugen <eugen@zeonfederated.com>
	Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)