Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +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