David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
account_moderation_notes	…
accounts	…
action_logs	…
custom_emojis	…
domain_blocks	…
email_domain_blocks	…
instances	…
invites	…
reports	…
settings	…
statuses	…
subscriptions	…