Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb	Do not distribute Delete when rejecting unapproved accounts (#10321)	2019-03-19 16:33:30 +01:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb	Randomize emoji filename (#10090)	2019-02-22 16:52:04 +01:00
dashboard_controller.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb
followers_controller.rb	Fix list of local followers showing remote followers in admin UI (#9700)	2019-01-03 06:40:16 +01:00
instances_controller.rb
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays_controller.rb
report_notes_controller.rb	Feature: Improve reports ui (#7032)	2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	2019-02-21 19:36:48 +01:00
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb
two_factor_authentications_controller.rb
warning_presets_controller.rb