Claire 32faa7213f Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README		2023-08-11 22:15:41 +02:00
..
chewy	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
controllers	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
helpers	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
javascript	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
lib	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
mailers	Add List-Unsubscribe email header (#26085)	2023-08-01 19:34:40 +02:00
models	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
policies	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
presenters	Wrong count in response when removing favourite/reblog (#24365)	2023-07-19 09:02:30 +02:00
serializers	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
services	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
validators	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
workers	Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00