mastodon/app/serializers
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
nodeinfo Fix nodeinfo metadata attribute being an array instead of an object (#20114) 2022-11-08 17:26:11 +01:00
rest Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01: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 2023-02-09 12:46:12 +01:00
manifest_serializer.rb Add maskable icon support for Android (#20904) 2022-11-17 10:52:30 +01:00
oembed_serializer.rb Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
webfinger_serializer.rb