mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-08 16:02:14 -05:00
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.