mastodon/app/models/form
Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
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.
2023-10-08 16:41:56 +02:00
..
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