This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
_media_attachments.html.haml	…
_status.html.haml	…
index.html.haml	…
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00