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
2018-05-10 00:03:28 +02:00
..
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
accounts Add resend confirmation for admin (#7378) 2018-05-06 10:59:03 +02:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
custom_emojis keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
domain_blocks
email_domain_blocks
instances
invites Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
settings Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
statuses Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
subscriptions