Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

account_batch.rb

Add batch suspend for accounts in admin UI (#17009)

2021-12-05 21:48:39 +01:00

admin_settings.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-26 22:53:55 +01:00

challenge.rb

…

custom_emoji_batch.rb

…

delete_confirmation.rb

…

ip_block_batch.rb

…

preview_card_batch.rb

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

preview_card_provider_batch.rb

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

redirect.rb

…

tag_batch.rb

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

two_factor_confirmation.rb

…