Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2022-11-16 08:30:00 +01:00
..
2018-01-16 03:29:11 +01:00
2016-08-17 17:58:00 +02:00
2018-10-09 03:02:52 +02:00
2017-12-06 15:04:49 +09:00
2016-12-06 17:19:26 +01:00
2017-01-22 23:07:31 +01:00
2022-03-26 02:53:34 +01:00
2018-10-04 12:36:53 +02:00
2016-08-17 17:58:00 +02:00