mirror of
https://github.com/glitch-soc/mastodon
synced 2025-04-24 22:24:51 +00:00
ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| node_info | ||
| rest | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oauth_metadata_serializer.rb | ||
| oauth_userinfo_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||