mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-11 10:12:56 -05:00
6530f9709c
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.