Claire 2a8e55b0ee Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream ... Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.		2023-08-24 21:46:17 +02:00
..
chewy	Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448)	2023-08-21 16:50:22 +02:00
controllers	Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
helpers	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
javascript	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
lib	Merge commit 'd67c1089643a25ab617c51a0cd3787eb0d7831b7' into glitch-soc/merge-upstream	2023-08-24 21:38:59 +02:00
mailers	Add List-Unsubscribe email header (#26085)	2023-08-01 19:34:40 +02:00
models	Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
policies	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
presenters	Add GET /api/v1/instance/languages to REST API (#24443)	2023-08-03 11:25:47 +02:00
serializers	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
services	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
validators	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
workers	Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00