You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/admin
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
8 years ago
..
account_moderation_notes Add moderator role and add pundit policies for admin actions (#5635) 8 years ago
accounts Display deleted users' role as “Suspended” (#6080) 8 years ago
action_logs Add consumable invites (#5814) 8 years ago
custom_emojis keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 8 years ago
domain_blocks
email_domain_blocks Fix style of email domain block table (#5218) 8 years ago
instances Add instance search feature (#4925) 8 years ago
invites Add invite filter (#5862) 8 years ago
reports Finalized theme loading and stuff 8 years ago
settings Add more instance stats APIs (#6125) 8 years ago
statuses Finalized theme loading and stuff 8 years ago
subscriptions