David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb		2017-12-15 12:20:56 -06:00
..
migrate	Merge branch 'gs-master' into prevent-local-only-federation	2017-12-15 12:20:56 -06:00
schema.rb	Merge branch 'gs-master' into prevent-local-only-federation	2017-12-15 12:20:56 -06:00
seeds.rb	…