Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
exports	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
migration	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
preferences
two_factor_authentication	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
aliases_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
applications_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
deletes_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
exports_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
featured_tags_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
flavours_controller.rb
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
imports_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
migrations_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
pictures_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
profiles_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
sessions_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00