mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02: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.