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 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		6 years ago
..
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_suspension_confirmation.rb	Add confirmation step to account suspensions (#8353)	6 years ago
delete_confirmation.rb	Account deletion (#3728)	8 years ago
migration.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
status_batch.rb	Get rid of all batch order warnings (#8334)	6 years ago
two_factor_confirmation.rb	…