Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
action_logs_controller.rb	…
announcements_controller.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
invites_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb	…
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	2020-01-24 00:20:23 +01:00
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…