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 aaec64a500 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 - config/locales/simple_form.en.yml		5 years ago
..
appearance	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
notifications	Change preferences page into appearance, notifications, and other (#10977)	6 years ago
other	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago