mirror of https://github.com/tootsuite/mastodon
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_relationships_presenter.rb | ||
| initial_state_presenter.rb | ||
| instance_presenter.rb | ||
| status_relationships_presenter.rb | ||