Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02:00
..
account_batch.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
ip_block_batch.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
redirect.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00
status_batch.rb
tag_batch.rb
two_factor_confirmation.rb