imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
activitypub	Use OrderedCollectionPage to return followers/following list (#4949)	2017-09-19 16:37:06 +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' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
status_relationships_presenter.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00