Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
chewy	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
mailers	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-18 11:44:54 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00