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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.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	Redesign landing page (again) (#6486)	7 years ago
statuses	Finalized theme loading and stuff	7 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago