Claire 6204d13a2e Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.		2024-05-01 19:38:34 +02:00
..
chewy
controllers	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
helpers	Merge commit '0622107449' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
javascript	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
lib	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
mailers	Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759)	2024-03-26 15:58:48 +00:00
models	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
policies
presenters
serializers	Merge commit 'a390299744' into glitch-soc/merge-upstream	2024-05-01 19:30:41 +02:00
services	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream	2024-05-01 17:22:02 +02:00
validators	Merge commit '52ab8a59c6' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
views	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
workers	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream	2024-05-01 17:22:02 +02:00