rinpatch 608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop' ...

Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982

2020-09-17 19:50:51 +03:00

..

controllers

Merge branch 'fix/2095-deactivated-account-reset' into 'develop'

2020-09-08 13:53:47 +03:00

views

Merge branch 'feat/rich-media-improvements' into 'develop'

2020-09-08 13:00:49 +03:00

mastodon_api.ex

NotificationController: Don't return chat_mentions by default.

2020-06-02 14:05:53 +02:00

websocket_handler.ex

Merge branch 'fix/streaming-termination-errors' into 'develop'

2020-09-17 19:50:51 +03:00