Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
..
2017-11-24 02:05:53 +01:00
2023-04-30 14:06:53 +02:00
2023-04-09 11:25:30 +02:00
2023-05-02 12:08:48 +02:00
2023-06-05 09:37:02 +02:00
2020-06-02 19:24:53 +02:00
2023-04-30 14:07:21 +02:00
2023-06-06 10:42:47 +02:00