Merge branch 'streaming-api-url-fix' into 'develop'
authorhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 19:39:50 +0000 (19:39 +0000)
committerhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 19:39:50 +0000 (19:39 +0000)
commitffbf306c9a03e88520c02690d5357d7a4937d961
treec9f2d0fcabd8d335ac82cece05ad55f4e204b634
parent7e384a2425b5188ca76aad4b97172b553ca9b640
parenta184811a605a56436cc5b9eae8ef5c3834285922
Merge branch 'streaming-api-url-fix' into 'develop'

Fix WebSocket streaming API URL.

See merge request pleroma/pleroma!756