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.
mastodon/app/views/settings
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
7 years ago
..
applications
deletes
exports
featured_tags
flavours
identity_proofs
imports
migrations
preferences Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
profiles Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
shared
two_factor_authentication
two_factor_authentications