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

Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.

2018-08-24 15:10:34 +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

Add confirmation step to account suspensions (#8353)

2018-08-22 11:53:41 +02:00

resets_controller.rb

…

roles_controller.rb

…

settings_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-24 15:10:34 +02:00

silences_controller.rb

…

statuses_controller.rb

…

subscriptions_controller.rb

…

suspensions_controller.rb

Fix regression when suspending not from report (#8400)

2018-08-23 21:51:56 +02:00

two_factor_authentications_controller.rb

…