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

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.

2021-09-30 00:01:20 +02:00

3.2 KiB

Raw Blame History

View Raw