You cannot 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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
exports	Add CSV export for lists and domain blocks (#9677)	6 years ago
two_factor_authentication	Create Settings::BaseController (#9507)	6 years ago
applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
base_controller.rb	Create Settings::BaseController (#9507)	6 years ago
deletes_controller.rb	Create Settings::BaseController (#9507)	6 years ago
exports_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
featured_tags_controller.rb	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago
flavours_controller.rb	Thank you, Officer Murphy	7 years ago
identity_proofs_controller.rb	Allow turning keybase off instance-wide	6 years ago
imports_controller.rb	Create Settings::BaseController (#9507)	6 years ago
migrations_controller.rb	Create Settings::BaseController (#9507)	6 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
two_factor_authentications_controller.rb	Create Settings::BaseController (#9507)	6 years ago