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

Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict caused because of minor code style change upstream, while glitch-soc
  has different code for handling variable maximum chars.
  Ported the change.
- `app/serializers/initial_state_serializer.rb`:
  Conflict because glitch-soc had two extra attributes where upstream added
  one.
  Added upstream's attribute.

2022-05-16 22:29:05 +02:00

4.3 KiB

Raw Blame History

View Raw