Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
..
2021-04-22 00:04:58 +02:00
2022-11-17 21:59:15 +09:00
2022-11-01 18:42:04 +09:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09:00
2020-11-09 00:56:52 +01:00
2020-07-10 20:57:21 +02:00
2023-02-01 19:59:31 +09:00
2020-11-10 16:53:54 +09:00
2022-11-17 21:59:15 +09:00
2023-02-22 21:16:02 +09:00
2023-01-19 02:31:13 +09:00
2020-11-09 00:56:52 +01:00
2022-11-01 18:42:04 +09:00
2023-01-19 02:31:13 +09:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09:00
2022-03-11 14:35:51 +09:00
2020-11-09 00:56:52 +01:00
2022-03-11 14:35:51 +09:00
2020-07-10 20:57:21 +02:00
2023-02-01 19:59:31 +09:00