Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
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
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
silences_controller.rb
statuses_controller.rb
subscriptions_controller.rb
suspensions_controller.rb
two_factor_authentications_controller.rb