Merge branch 'develop' into 'fix/hide-follows-counters'
authorkaniini <ariadne@dereferenced.org>
Sat, 10 Aug 2019 18:49:04 +0000 (18:49 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 10 Aug 2019 18:49:04 +0000 (18:49 +0000)
commit84808e1697c3b557e4a01104389e78c63cb53528
tree7f06092a81cabcceb6c02cf5698c1ca4bd6d8754
parent409bcad54b5de631536761952faed05ad5fe3b99
parent708e7f09423eb28c97a8007b9b11bb7b94c9e296
Merge branch 'develop' into 'fix/hide-follows-counters'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md