mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 20:56:50 +00:00
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
---|---|---|
.. | ||
bookmarks_controller.rb | ||
favourited_by_accounts_controller.rb | ||
favourites_controller.rb | ||
mutes_controller.rb | ||
pins_controller.rb | ||
reblogged_by_accounts_controller.rb | ||
reblogs_controller.rb |