mirror of
https://github.com/funamitech/mastodon
synced 2024-12-04 17:58:49 +09:00
d7fcd70023
Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version. |
||
---|---|---|
.. | ||
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 |