Claire c499c4a019 Merge commit 'd2ee5b19004995d385e344c5b3216e29c8337094' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether.		2023-09-02 13:18:16 +02:00
..
chewy	Fix multiple issues with status index mappings (#26686)	2023-08-28 11:36:17 +02:00
controllers	Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream	2023-09-02 12:20:33 +02:00
helpers	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
javascript	Merge commit 'd2ee5b19004995d385e344c5b3216e29c8337094' into glitch-soc/merge-upstream	2023-09-02 13:18:16 +02:00
lib	Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00
mailers	Add List-Unsubscribe email header (#26085)	2023-08-01 19:34:40 +02:00
models	Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream	2023-09-02 12:20:33 +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 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
services	Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00
validators	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
workers	Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00