Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| nodeinfo | ||
| rest | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||