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).
2018-08-17 17:43:54 +02:00
..
applications
deletes
exports Show exact number of followers/statuses on export page/in tooltip (#8199) 2018-08-14 21:56:17 +02:00
flavours
follower_domains
imports Show exact number of followers/statuses on export page/in tooltip (#8199) 2018-08-14 21:56:17 +02:00
migrations Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
notifications
preferences
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
shared
two_factor_authentication
two_factor_authentications