mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 00:21:40 +01:00
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.