Conflicts: - `app/views/wrapstodon/show.html.haml`: Conflict because of glitch-soc's theming system. Applied upstream's changes.
Conflicts: - `app/views/wrapstodon/show.html.haml`: Conflict because of glitch-soc's theming system. Applied upstream's changes.