mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-25 03:47:07 +00:00
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.