Claire b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.		2023-07-07 19:59:43 +02:00
..
chewy	Change account search to match by text when opted-in (#25599)	2023-06-29 13:05:21 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
javascript	Fix incorrect secondary button size (#2276)	2023-07-07 09:50:06 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-07 19:59:43 +02:00
mailers	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-07 19:59:43 +02:00
policies	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
presenters
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
validators
views	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-27 13:15:41 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00