David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
applications
deletes
exports	Add hint about 7 day cooldown for archive takeout (#7375)	2018-05-06 10:53:10 +02:00
flavours
follower_domains
imports
keyword_mutes
migrations
notifications
preferences	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
profiles	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
shared
two_factor_authentication
two_factor_authentications