mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
delete_confirmation.rb | ||
migration.rb | ||
status_batch.rb | ||
two_factor_confirmation.rb |