mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-11 10:12:56 -05:00
1d6152f440
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.