Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml

2019-03-26 16:02:54 +01:00

..

account_actions_controller.rb

…

account_moderation_notes_controller.rb

…

accounts_controller.rb

…

action_logs_controller.rb

…

base_controller.rb

…

change_emails_controller.rb

…

confirmations_controller.rb

…

custom_emojis_controller.rb

…

dashboard_controller.rb

Change icons of features on admin dashboard to remove bias (#10366)

2019-03-26 01:24:19 +01:00

domain_blocks_controller.rb

…

email_domain_blocks_controller.rb

…

followers_controller.rb

…

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

…

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

…

statuses_controller.rb

…

subscriptions_controller.rb

…

tags_controller.rb

…

two_factor_authentications_controller.rb

…

warning_presets_controller.rb

…