mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 04:03:06 -05:00
59e92004b3
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency