You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		3 years ago
..
_action_log.html.haml	Improve report layout (#7188)	6 years ago
_status.html.haml	Fix admin interface crashing when listing boosts with non-video media attachments (#12907)	4 years ago
index.html.haml	Add indication to admin UI of whether a report has been forwarded (#13237)	3 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	3 years ago