mastodon/app/serializers
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
activitypub Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +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 commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
web
initial_state_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
manifest_serializer.rb Add maskable icon support for Android (#20904) 2022-11-17 10:52:30 +01:00
oembed_serializer.rb
webfinger_serializer.rb