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

..

activitypub

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-28 16:22:28 +02:00

nodeinfo

Add openRegistrations attribute to nodeinfo endpoint (#12058)

2019-10-02 21:02:48 +02:00

rest

Merge branch 'main' into glitch-soc/merge-upstream

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

web

Fix web push notifications containing HTML entities (#18071)

2022-04-23 21:47:43 +02:00

initial_state_serializer.rb

Merge branch 'main' into glitch-soc/merge-upstream

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

manifest_serializer.rb

fix: PWA web manifest not changed to new routes (#17921)

2022-03-31 11:20:26 +02:00

oembed_serializer.rb

Improve RSS entries for statuses (#13592)

2020-05-10 09:50:54 +02:00

webfinger_serializer.rb

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02:00