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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
8 years ago
..
applications Add more granular OAuth scopes (#7929) 8 years ago
deletes Fix autocomplete option in haml files (#4438) 9 years ago
exports Show exact number of followers/statuses on export page/in tooltip (#8199) 8 years ago
flavours Don't show skins selector when there's only one (#256) 8 years ago
follower_domains Scrollable tables in settings pages (#4857) 9 years ago
imports Show exact number of followers/statuses on export page/in tooltip (#8199) 8 years ago
migrations Redesign public profiles and toots (#8068) 8 years ago
notifications Add option to block direct messages from people you don't follow (#5669) 8 years ago
preferences Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
profiles Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
shared 2FA controller cleanup (#2296) 9 years ago
two_factor_authentication Fix autocomplete option in haml files (#4438) 9 years ago
two_factor_authentications Fix autocomplete option in haml files (#4438) 9 years ago