Merge branch 'revert-4fabf83a' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)
commitfe7fd331263007e0fb2877ef7370a09a9704da36
tree3e4ed9af085e410ebab1adbb6ecc1d9cd84f3e42
parent4fabf83ad01352442906d79187aeab4c777f4df8
parentc623b4324deaf236334a0f77a81435b5bffadf3c
Merge branch 'revert-4fabf83a' into 'develop'

Revert "Merge branch 'streamer-refactoring' into 'develop'"

See merge request pleroma/pleroma!1674