From: kaniini <ariadne@dereferenced.org>
Date: Mon, 16 Sep 2019 09:09:32 +0000 (+0000)
Subject: Merge branch 'revert-4fabf83a' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fe7fd331263007e0fb2877ef7370a09a9704da36;p=akkoma

Merge branch 'revert-4fabf83a' into 'develop'

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

See merge request pleroma/pleroma!1674
---

fe7fd331263007e0fb2877ef7370a09a9704da36