From: kaniini <nenolod@gmail.com>
Date: Fri, 1 Feb 2019 20:23:55 +0000 (+0000)
Subject: Merge branch 'revert-0a82a7e6' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=09e1c8c05dedf96710571a55f0be65fdff4ccdd0;hp=-c;p=akkoma

Merge branch 'revert-0a82a7e6' into 'develop'

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

See merge request pleroma/pleroma!758
---

09e1c8c05dedf96710571a55f0be65fdff4ccdd0