Merge branch 'revert-5c04e817' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 10:00:44 +0000 (10:00 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 10:00:44 +0000 (10:00 +0000)
commite51c20f28a91028b06a5783601e4ce09536bba5b
tree2a79aae59c6ce7500d360ba35a5b0aafe2146072
parent9c47d8571c6c46503d9bb836aea933eda6e9e0a5
parente07e9cb75e6605218acea1ef41772ca29124bd0d
Merge branch 'revert-5c04e817' into 'develop'

Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

See merge request pleroma/pleroma!1794