luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-15 18:06:04 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
History
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
activitypub Fix media not being marked sensitive when outgoing CW is set 2020-11-13 01:05:55 +01:00
nodeinfo
rest Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
rss
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
manifest_serializer.rb Add app shortcuts (#15234) 2020-12-15 02:04:56 +01:00
oembed_serializer.rb
webfinger_serializer.rb