mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
30ee7339d3
Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| domain_block_batch.rb | ||
| email_domain_block_batch.rb | ||
| import.rb | ||
| ip_block_batch.rb | ||
| redirect.rb | ||
| status_filter_batch_action.rb | ||
| two_factor_confirmation.rb | ||