mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
8c3c27bf06
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes. |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cache_cli.rb | ||
| cli_helper.rb | ||
| domains_cli.rb | ||
| email_domain_blocks_cli.rb | ||
| emoji_cli.rb | ||
| feeds_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| preview_cards_cli.rb | ||
| redis_config.rb | ||
| search_cli.rb | ||
| settings_cli.rb | ||
| snowflake.rb | ||
| statuses_cli.rb | ||
| upgrade_cli.rb | ||
| version.rb | ||