Merge branch 'fix/streaming-termination-errors' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 16:50:51 +0000 (19:50 +0300)
commit608017b7df5916b607e707627dc09d89599129ff
tree71cbb9862a06fb9969bf9e51e2e13fc0b5e0f323
parent0465bdbd49ad729e9aec0b3f330607386f433d5d
Merge branch 'fix/streaming-termination-errors' into 'develop'

Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982
lib/pleroma/web/mastodon_api/websocket_handler.ex
test/integration/mastodon_websocket_test.exs