Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes.		2024-10-16 12:42:12 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
helpers	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
javascript	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
lib	Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3	2024-10-15 17:42:22 +02:00
mailers	Add coverage for missing status scenario in NotificationMailer (#32256)	2024-10-07 10:54:23 +02:00
models	Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3	2024-10-15 17:42:22 +02:00
policies	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
presenters	Add preview of followers removed in domain block modal in web UI (#32032)	2024-09-25 18:13:36 +00:00
serializers	Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream	2024-09-29 11:06:09 +02:00
services	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
validators	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
views	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
workers	Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3	2024-10-14 19:18:08 +02:00