mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-17 08:50:54 -04:00
Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.
Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.