Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		2020-01-20 18:31:11 +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 not all of account's active IPs showing up in admin UI (#12909)	2020-01-20 18:00:54 +01:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +02: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
followers	…
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
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	…