Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02: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	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-24 15:10:34 +02:00
status_relationships_presenter.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00