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 175446f293 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		3 years ago
..
_actions.html.haml	Change actions in reports to require only one click (#17487)	3 years ago
_status.html.haml	Add post edited notice in admin and public UIs (#17335)	3 years ago
index.html.haml	Add ability to filter reports by origin of target account (#16487)	3 years ago
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago