Merge pull request #887 from valentin2105/master

author Eugen <eugen@zeonfederated.com>

Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)

committer GitHub <noreply@github.com>

Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)
author Eugen <eugen@zeonfederated.com>
Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)
committer GitHub <noreply@github.com>
Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
Simple merge
author	Eugen <eugen@zeonfederated.com>
	Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)
committer	GitHub <noreply@github.com>
	Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)