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 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system		6 years ago
..
account_batch.rb	…
admin_settings.rb	…
delete_confirmation.rb	…
migration.rb	…
status_batch.rb	Record deleted(by mod) status to prevent re-appear (#10732)	6 years ago
two_factor_confirmation.rb	…