Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
chewy
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
mailers	Add single splat to callback method definitions to avoid ArgumentError (#22246)	2022-12-13 20:03:16 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Add follow request banner on account header (#20785)	2022-12-15 18:50:11 +01:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00