Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system.		2024-07-15 18:51:38 +02:00
..
chewy	…
controllers	Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream	2024-07-14 18:43:35 +02:00
helpers	Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream	2024-07-15 18:51:38 +02:00
javascript	Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream	2024-07-15 18:51:38 +02:00
lib	Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream	2024-07-10 16:58:06 +02:00
mailers	…
models	Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream	2024-07-14 18:43:35 +02:00
policies	…
presenters	…
serializers	Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream	2024-07-15 18:51:38 +02:00
services	Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream	2024-07-09 20:39:09 +02:00
validators	…
views	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
workers	…