Claire 93c714417f Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.		2023-06-10 14:38:04 +02:00
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	2022-05-22 22:16:43 +02:00
controllers	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
helpers	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
javascript	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
lib	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
mailers	Add user handle to notification mail recipient address (#24240)	2023-04-17 11:06:06 +02:00
models	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
services	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
validators	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
views	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
workers	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00