mirror of https://github.com/tootsuite/mastodon
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_relationships_presenter.rb | ||
| initial_state_presenter.rb | ||
| instance_presenter.rb | ||
| status_relationships_presenter.rb | ||