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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
7 years ago
..
applications Add more granular OAuth scopes (#7929) 7 years ago
deletes
exports Better singulars of account followers/toots. (#8471) 7 years ago
flavours
follower_domains
imports Show exact number of followers/statuses on export page/in tooltip (#8199) 7 years ago
migrations Redesign public profiles and toots (#8068) 7 years ago
notifications
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