You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
account_moderation_notes	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
accounts	Display deleted users' role as “Suspended” (#6339)	7 years ago
action_logs	Add consumable invites (#5814)	7 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks	Scrollable tables in settings pages (#4857)	7 years ago
email_domain_blocks	Fix style of email domain block table (#5218)	7 years ago
instances	Add instance search feature (#4925)	7 years ago
invites	Add invite filter (#5862)	7 years ago
reports	Finalized theme loading and stuff	7 years ago
settings	Add option to show only local toots in timeline preview (#6292)	7 years ago
statuses	Finalized theme loading and stuff	7 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago