luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 12:19:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
History
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
2022-11-10 09:36:47 +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 2022-11-10 09:36:47 +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 2022-11-06 09:50:41 +01:00
manifest_serializer.rb Change floating action button to be a button in header in web UI (#19422) 2022-10-23 15:58:24 +02:00
oembed_serializer.rb
webfinger_serializer.rb