Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex		2020-04-02 19:38:39 +03:00
..
controllers	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.	2020-04-01 19:49:09 +03:00
views	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses	2020-04-02 19:38:39 +03:00
mastodon_api.ex	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
websocket_handler.ex	Update Copyrights	2020-03-03 16:44:49 -06:00