mastodon-docker-playground/app/presenters
Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
..
activitypub
account_relationships_presenter.rb Fix relationship caches being broken as result of a follow request (#12299) 2019-11-07 09:08:00 +02:00
initial_state_presenter.rb
instance_presenter.rb
status_relationships_presenter.rb