Claire 7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream refactored slightly (but touching almost all the lines in the code), glitch-soc had moved a few of the code to another file. Refactored as upstream did.		2023-08-24 20:34:14 +02:00
..
chewy	Add `ES_PRESET` option to customize numbers of shards and replicas (#26483)	2023-08-14 17:46:16 +02:00
controllers	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
helpers	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
javascript	Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream	2023-08-24 20:34:14 +02:00
lib	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
mailers	Add List-Unsubscribe email header (#26085)	2023-08-01 19:34:40 +02:00
models	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	2023-08-22 19:50:37 +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 '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main	2023-08-13 18:47:15 +02:00
services	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	2023-08-22 19:50:37 +02:00
workers	Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream	2023-08-12 09:36:38 +02:00