This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		2017-12-30 17:20:07 -06:00
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
base_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
silences_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
suspensions_controller.rb	…
two_factor_authentications_controller.rb	…