Merge branch 'develop' into 'hide-muted-reactions'
authorminibikini <egor@kislitsyn.com>
Wed, 18 Nov 2020 20:22:40 +0000 (20:22 +0000)
committerminibikini <egor@kislitsyn.com>
Wed, 18 Nov 2020 20:22:40 +0000 (20:22 +0000)
commit6669ac5bf7749be325a10f92cc9eed49c6be2761
tree107cd84c2a05d80f684f7d7ec1608fb4f6d3c606
parent1d03ba4ffbb73b54a7caa107a6b9a85fa65ecfd4
parenta1056aace19d5f6201f06937a93f978917df8418
Merge branch 'develop' into 'hide-muted-reactions'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/user.ex