mastodon/app/presenters
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
activitypub
account_relationships_presenter.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
initial_state_presenter.rb
instance_presenter.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
status_relationships_presenter.rb