mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 23:42:11 -05:00
Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.
Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.