mirror of https://github.com/tootsuite/mastodon
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| rest | ||
| rss | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||