David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/controllers/auth/confirmations_controller.rb

2017-12-30 17:20:07 -06:00

..

account_moderation_notes

…

accounts

Display deleted users' role as “Suspended” (#6080)

2017-12-22 02:14:17 +01:00

action_logs

…

custom_emojis

keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)

2017-12-30 02:43:43 +01:00

domain_blocks

…

email_domain_blocks

…

instances

…

invites

Add invite filter (#5862)

2017-12-01 16:40:02 +01:00

reports

…

settings

Add more instance stats APIs (#6125)

2017-12-29 19:52:04 +01:00

statuses

…

subscriptions

…