Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		2018-12-15 10:45:53 +01:00
..
account_moderation_notes
accounts	Restore profile links in /admin/accounts (#9494)	2018-12-14 01:47:50 +01:00
action_logs
change_emails
custom_emojis
dashboard	Add instance-wide setting to disable profile directory (#9497)	2018-12-11 19:18:29 +01:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
email_domain_blocks	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
instances	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
invites
relays
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
statuses
subscriptions
suspensions
tags	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00