mastodon/app/serializers
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
2023-08-24 21:46:17 +02:00
..
activitypub Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 2023-08-24 21:46:17 +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 '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
web Update dependency rubocop-rails to v2.20.1 (#25493) 2023-07-13 11:44:02 +02:00
initial_state_serializer.rb Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02: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 Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00