mirror of https://github.com/tootsuite/mastodon
02062aab55
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb |
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_relationships_presenter.rb | ||
| initial_state_presenter.rb | ||
| instance_presenter.rb | ||
| status_relationships_presenter.rb | ||