Merge branch 'revert-0a82a7e6' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 20:23:55 +0000 (20:23 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 20:23:55 +0000 (20:23 +0000)
commit09e1c8c05dedf96710571a55f0be65fdff4ccdd0
treed639c4f000b3ecafa6c5b7ea8b99f25557ac5141
parent28bfb09b01d324e149e9f36a74db2674a07b07da
parent486749064f72ac5078a42ed339519afbbf48027a
Merge branch 'revert-0a82a7e6' into 'develop'

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

See merge request pleroma/pleroma!758