mastodon/app/presenters
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
activitypub Better pagination for ActivityPub outbox (#7356) 2018-05-04 19:19:11 +02:00
account_relationships_presenter.rb Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
initial_state_presenter.rb
instance_presenter.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
status_relationships_presenter.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00