From: David Yip <yipdw@member.fsf.org>
Date: Fri, 15 Dec 2017 18:20:56 +0000 (-0600)
Subject: Merge branch 'gs-master' into prevent-local-only-federation
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=82b2e224a26765caf743b24844912faa2de9873a;p=mastodon.git

Merge branch 'gs-master' into prevent-local-only-federation

 Conflicts:
	db/schema.rb
---

82b2e224a26765caf743b24844912faa2de9873a