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.		2020-12-15 14:27:06 +01:00
..
_action_log.html.haml
_status.html.haml
index.html.haml	Add indication to admin UI of whether a report has been forwarded (#13237)	2020-12-15 04:30:15 +01:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00