mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-28 14:20:46 -04:00
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency