mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
9b861d56a9
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| ip_block_batch.rb | ||
| preview_card_batch.rb | ||
| preview_card_provider_batch.rb | ||
| redirect.rb | ||
| status_batch.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||