mirror of https://github.com/tootsuite/mastodon
ab5ff638f2
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| redirect.rb | ||
| status_batch.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||