You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
account_batch.rb	Add follow selected followers button (#15148)	4 years ago
admin_settings.rb	Add support for setting Content Warning for CW-less outgoing toots	5 years ago
challenge.rb	…
custom_emoji_batch.rb	Cache result of SQL (#14534)	4 years ago
delete_confirmation.rb	…
ip_block_batch.rb	Add IP-based rules (#14963)	4 years ago
redirect.rb	Remove dependency on goldfinger gem (#14919)	4 years ago
status_batch.rb	…
tag_batch.rb	…
two_factor_confirmation.rb	…