mastodon/app/views/admin
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
..
account_moderation_notes
accounts Add confirmation step to account suspensions (#8353) 2018-08-22 11:53:41 +02:00
action_logs
change_emails
custom_emojis
dashboard Fix tag usage display on admin dashboard 2018-07-16 19:51:16 +02:00
domain_blocks
email_domain_blocks
instances
invites Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
statuses
subscriptions
suspensions Add confirmation step to account suspensions (#8353) 2018-08-22 11:53:41 +02:00