tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
c91d9b7389
mastodon/app/views/admin/reports
History
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
2018-10-01 12:43:20 +02:00
..
_action_log.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
_status.html.haml Fix broken report detail (regression from #8569) (#8795) 2018-09-26 19:48:14 +02:00
index.html.haml Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00