Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' 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 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
helpers	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
javascript	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
lib	Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' 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 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
policies	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' 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 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
services	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
workers	Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00