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.  | 
			||
|---|---|---|
| .. | ||
| activity | ||
| parser | ||
| activity.rb | ||
| adapter.rb | ||
| case_transform.rb | ||
| dereferencer.rb | ||
| forwarder.rb | ||
| linked_data_signature.rb | ||
| serializer.rb | ||
| tag_manager.rb | ||