Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
account_batch.rb	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02:00
admin_settings.rb
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
status_batch.rb
tag_batch.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
two_factor_confirmation.rb