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 fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		6 years ago
..
account_batch.rb	Add relationship manager UI (#10268)	6 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	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	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	6 years ago
two_factor_confirmation.rb	…