Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.		2023-09-02 13:31:15 +02:00
..
chewy	Fix multiple issues with status index mappings (#26686)	2023-08-28 11:36:17 +02:00
controllers	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00
helpers	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
javascript	Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream	2023-09-02 13:18:16 +02:00
lib	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' 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 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream	2023-09-02 12:20:33 +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 '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
services	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
workers	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00