Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml		2018-08-01 22:20:25 +02:00
..
activitypub	Better pagination for ActivityPub outbox (#7356)	2018-05-04 19:19:11 +02:00
account_relationships_presenter.rb	Fix bug in relationships API introduced by #6482 (#6527)	2018-02-21 23:22:12 +01:00
initial_state_presenter.rb	Add protocol handler. Handle follow intents (#4511)	2017-08-14 04:53:31 +02:00
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
status_relationships_presenter.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00