Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

account_moderation_notes

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

accounts

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

action_logs

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

change_emails

Feature: Allow staff to change user emails (#7074)

2018-04-10 09:16:06 +02:00

custom_emojis

…

domain_blocks

…

email_domain_blocks

…

instances

…

invites

…

report_notes

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

reports

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

settings

…

statuses

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

subscriptions

…