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
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
8 years ago
..
account_moderation_notes Improve admin UI for accounts (#7360) 8 years ago
accounts Add resend confirmation for admin (#7378) 8 years ago
action_logs Improve report layout (#7188) 8 years ago
change_emails Feature: Allow staff to change user emails (#7074) 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
instances
invites Add invite filter (#5862) 8 years ago
report_notes Improve report layout (#7188) 8 years ago
reports Merge branch 'master' into glitch-soc/master 8 years ago
settings Redesign landing page (again) (#6486) 8 years ago
statuses Merge branch 'master' into glitch-soc/master 8 years ago
subscriptions