You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		7 years ago
..
account_moderation_notes	Improve admin UI for accounts (#7360)	7 years ago
accounts	Add resend confirmation for admin (#7378)	7 years ago
action_logs	Improve report layout (#7188)	7 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	7 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks	Scrollable tables in settings pages (#4857)	7 years ago
email_domain_blocks	Fix style of email domain block table (#5218)	7 years ago
instances	Add instance search feature (#4925)	7 years ago
invites	Add invite filter (#5862)	7 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge branch 'master' into glitch-soc/master	7 years ago
settings	Redesign landing page (again) (#6486)	7 years ago
statuses	Merge branch 'master' into glitch-soc/master	7 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago