mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 18:52:52 -05:00
e25cc4deb7
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes.