Merge pull request #885 from optikfluffel/patch-1

author Eugen <eugen@zeonfederated.com>

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

committer GitHub <noreply@github.com>

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