Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.

2021-03-02 12:06:58 +01:00

21 KiB

Raw Blame History

View Raw