Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
_actions.html.haml	Add ability to mark statuses as sensitive from reports in admin UI (#17668)	2022-03-01 22:20:29 +01:00
_media_attachments.html.haml	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
_status.html.haml	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
index.html.haml	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00