Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
account_batch.rb	Change batch account suspension to create a strike (#20897)	2022-11-17 10:52:51 +01:00
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
domain_block_batch.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
email_domain_block_batch.rb
ip_block_batch.rb
redirect.rb	Fix 500 error when trying to migrate to an invalid address (#21462)	2022-12-07 02:35:39 +01:00
status_filter_batch_action.rb
two_factor_confirmation.rb