Merge pull request #846 from TrollDecker/master

author Eugen <eugen@zeonfederated.com>

Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)

committer GitHub <noreply@github.com>

Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)
author Eugen <eugen@zeonfederated.com>
Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)
committer GitHub <noreply@github.com>
Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
Simple merge
author	Eugen <eugen@zeonfederated.com>
	Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)
committer	GitHub <noreply@github.com>
	Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)