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
..
2023-05-02 12:08:48 +02:00
2023-06-06 10:42:47 +02:00
2018-10-07 23:44:58 +02:00
2020-09-08 03:41:16 +02:00