| Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did. | ||
|---|---|---|
| .. | ||
| activitypub | ||
| node_info | ||
| rest | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oauth_metadata_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||