Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		2020-11-12 22:13:57 +01:00
..
account_batch.rb	Add follow selected followers button (#15148)	2020-11-12 16:58:00 +01:00
admin_settings.rb
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
ip_block_batch.rb
redirect.rb
status_batch.rb
tag_batch.rb
two_factor_confirmation.rb