Thibaut Girka 44744e3ce1 Merge branch 'master' into glitch-soc/merge-upstream		2020-01-28 19:15:03 +01:00
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
account_moderation_notes
account_warnings
accounts	Fix relationships page not showing results in admin UI (#12934)	2020-01-24 00:20:23 +01:00
action_logs
announcements	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
change_emails
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	2019-09-13 20:28:22 +02:00
domain_blocks	Fix domain block edition in glitch-soc	2019-08-08 09:14:20 +02:00
email_domain_blocks	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
instances	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
invites
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
relationships	Change followers page to relationships page in admin UI (#12927)	2020-01-23 20:33:20 +01:00
relays
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
settings	Fix issue because of theming system	2019-12-19 14:42:16 +01:00
statuses
tags	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
warning_presets