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/reports
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
8 years ago
..
_action_log.html.haml Improve report layout (#7188) 8 years ago
_status.html.haml Fix broken report detail (regression from #8569) (#8795) 8 years ago
index.html.haml Group reports by target account (#8674) 8 years ago
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 8 years ago