Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream		2018-08-19 09:27:18 +02:00
..
account_moderation_notes_controller.rb
accounts_controller.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	2018-04-02 13:45:07 +02:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
confirmations_controller.rb	Add resend confirmation for admin (#7378)	2018-05-06 10:59:03 +02:00
custom_emojis_controller.rb
dashboard_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
silences_controller.rb
statuses_controller.rb
subscriptions_controller.rb
suspensions_controller.rb
two_factor_authentications_controller.rb